Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Split apart "always show bookmarks toolbar" and the bookmarks toolbar display mode #4944

Merged
merged 1 commit into from
Oct 19, 2016
Merged

Split apart "always show bookmarks toolbar" and the bookmarks toolbar display mode #4944

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,6 @@ class GeneralTab extends ImmutableComponent {
const homepageValue = getSetting(settings.HOMEPAGE, this.props.settings)
const homepage = homepageValue && homepageValue.trim()
const disableShowHomeButton = !homepage || !homepage.length
const disableBookmarksBarSelect = !getSetting(settings.SHOW_BOOKMARKS_TOOLBAR, this.props.settings)
const defaultLanguage = this.props.languageCodes.find((lang) => lang.includes(navigator.language)) || 'en-US'
const defaultBrowser = getSetting(settings.IS_DEFAULT_BROWSER, this.props.settings)
? <div className='sectionTitle' data-l10n-id='defaultBrowser' />
Expand Down Expand Up @@ -652,7 +651,6 @@ class GeneralTab extends ImmutableComponent {
<SettingCheckbox dataL10nId='disableTitleMode' prefKey={settings.DISABLE_TITLE_MODE} settings={this.props.settings} onChangeSetting={this.props.onChangeSetting} />
<SettingItem dataL10nId='bookmarkToolbarSettings'>
<select id='bookmarksBarSelect' value={getSetting(settings.BOOKMARKS_TOOLBAR_MODE, this.props.settings)}
disabled={disableBookmarksBarSelect}
onChange={changeSetting.bind(null, this.props.onChangeSetting, settings.BOOKMARKS_TOOLBAR_MODE)} >
<option data-l10n-id='bookmarksBarTextOnly' value={bookmarksToolbarMode.TEXT_ONLY} />
<option data-l10n-id='bookmarksBarTextAndFavicon' value={bookmarksToolbarMode.TEXT_AND_FAVICONS} />
Expand Down