Merge pull request #5335 from bsclifton/default-to-newtab

Removed "blank" option (about:blank !== about:newtab)
brave · Nov 1, 2016 · 8d369b0 · 8d369b0
2 parents d7d2718 + 96492aa
commit 8d369b0
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/app/common/constants/settingsEnums.js b/app/common/constants/settingsEnums.js
@@ -9,7 +9,6 @@ const startsWithOption = {
 }
 
 const newTabMode = {
-  BLANK: 'blank',
   NEW_TAB_PAGE: 'newTabPage',
   HOMEPAGE: 'homePage',
   DEFAULT_SEARCH_ENGINE: 'defaultSearchEngine'

diff --git a/docs/state.md b/docs/state.md
@@ -161,7 +161,7 @@ AppStore
     // See defaults in js/constants/appConfig.js
     'general.startup-mode': string, // One of: lastTime, homePage, newTabPage
     'general.homepage': string, // URL of the user's homepage
-    'general.newtab-mode-TEMP': string,  // One of: blank, newTabPage, homePage, defaultSearchEngine
+    'general.newtab-mode': string,  // One of: newTabPage, homePage, defaultSearchEngine
     'general.show-home-button': boolean, // true if the home button should be shown
     'general.useragent.value': (undefined|string), // custom user agent value
     'general.downloads.default-save-path': string, // default path for saving files

diff --git a/js/about/preferences.js b/js/about/preferences.js
@@ -655,7 +655,6 @@ class GeneralTab extends ImmutableComponent {
         <SettingItem dataL10nId='newTabMode'>
           <select value={getSetting(settings.NEWTAB_MODE, this.props.settings)}
             onChange={changeSetting.bind(null, this.props.onChangeSetting, settings.NEWTAB_MODE)} >
-            <option data-l10n-id='newTabBlank' value={newTabMode.BLANK} />
             <option data-l10n-id='newTabNewTabPage' value={newTabMode.NEW_TAB_PAGE} />
             <option data-l10n-id='newTabHomePage' value={newTabMode.HOMEPAGE} />
             <option data-l10n-id='newTabDefaultSearchEngine' value={newTabMode.DEFAULT_SEARCH_ENGINE} />

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -99,7 +99,7 @@ module.exports = {
     'general.language': null, // null means to use the OS lang
     'general.startup-mode': 'lastTime',
     'general.homepage': 'https://www.brave.com',
-    'general.newtab-mode-TEMP': process.env.NODE_ENV === 'test' ? 'newTabPage' : 'blank',
+    'general.newtab-mode': 'newTabPage',
     'general.show-home-button': false,
     'general.useragent.value': null, // Set at runtime
     'general.autohide-menu': true,

diff --git a/js/constants/settings.js b/js/constants/settings.js
@@ -6,7 +6,7 @@ const settings = {
   // General tab
   STARTUP_MODE: 'general.startup-mode',
   HOMEPAGE: 'general.homepage',
-  NEWTAB_MODE: 'general.newtab-mode-TEMP',
+  NEWTAB_MODE: 'general.newtab-mode',
   SHOW_HOME_BUTTON: 'general.show-home-button',
   USERAGENT: 'general.useragent.value',
   DEFAULT_DOWNLOAD_SAVE_PATH: 'general.downloads.default-save-path',

diff --git a/js/lib/appUrlUtil.js b/js/lib/appUrlUtil.js
@@ -159,11 +159,8 @@ module.exports.newFrameUrl = function () {
   const {newTabMode} = require('../../app/common/constants/settingsEnums')
 
   switch (settingValue) {
-    case newTabMode.NEW_TAB_PAGE:
-      return 'about:newtab'
-
     case newTabMode.HOMEPAGE:
-      return getSetting(settings.HOMEPAGE) || 'about:blank'
+      return getSetting(settings.HOMEPAGE) || 'about:newtab'
 
     case newTabMode.DEFAULT_SEARCH_ENGINE:
       const searchProviders = require('../data/searchProviders').providers
@@ -173,7 +170,8 @@ module.exports.newFrameUrl = function () {
       })
       return defaultSearchEngineSettings[0].base
 
+    case newTabMode.NEW_TAB_PAGE:
     default:
-      return 'about:blank'
+      return 'about:newtab'
   }
 }