merge.props

brave · May 16, 2017 · 9edeee4 · 9edeee4
1 parent d7975d0
commit 9edeee4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/app/renderer/components/navigation/navigationBar.js b/app/renderer/components/navigation/navigationBar.js
@@ -163,13 +163,12 @@ class NavigationBar extends React.Component {
  props.activeTabShowingMessageBox = activeTabShowingMessageBox
  props.locationInfo = state.get('locationInfo')
  props.titleMode = titleMode
+ props.isWideURLbarEnabled = getSetting(settings.WIDE_URL_BAR)
 
  return props
  }
 
  render () {
- const wideURLbar = getSetting(settings.WIDE_URL_BAR)
-
  if (this.props.activeFrameKey === undefined ||
  this.props.siteSettings === undefined) {
  return null
@@ -180,7 +179,7 @@ class NavigationBar extends React.Component {
  data-frame-key={this.props.activeFrameKey}
  className={cx({
  titleMode: this.props.titleMode,
- [css(styles.navigator_wide)]: wideURLbar
+ [css(styles.navigator_wide)]: this.props.isWideURLbarEnabled
  })}>
  {
  this.props.bookmarkDetail && this.props.bookmarkDetail.get('isBookmarkHanger')

diff --git a/app/renderer/components/navigation/urlBar.js b/app/renderer/components/navigation/urlBar.js
@@ -473,6 +473,7 @@ class UrlBar extends React.Component {
  props.isSelected = urlbar.get('selected')
  props.isFocused = urlbar.get('focused')
  props.isHTTPPage = isHTTPPage
+ props.isWideURLbarEnabled = getSetting(settings.WIDE_URL_BAR)
  props.activateSearchEngine = activateSearchEngine
  props.searchSelectEntry = urlbarSearchDetail
  props.autocompleteEnabled = urlbar.getIn(['suggestions', 'autocompleteEnabled'])
@@ -483,12 +484,10 @@ class UrlBar extends React.Component {
  }
 
  render () {
- const wideURLbar = getSetting(settings.WIDE_URL_BAR)
-
  return <form
  className={cx({
  urlbarForm: true,
- [css(styles.urlbarForm_wide)]: wideURLbar,
+ [css(styles.urlbarForm_wide)]: this.props.isWideURLbarEnabled,
  noBorderRadius: this.props.noBorderRadius
  })}
  action='#'