diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-03-30 09:44:21 +0200 |
| commit | a1a007a4856fa50d6d811c2268f881e3666f4c67 (patch) | |
| tree | 24b082c1bfb5777f1770c82a534bf765160bc1b8 /toolkit/modules | |
| parent | eddd0de2ae80e176011f41a5400e81522d53f4f3 (diff) | |
| parent | 59bf4204a84f7638d3f89a29bc7c04e5dc401369 (diff) | |
| download | UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.gz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.lz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.tar.xz UXP-a1a007a4856fa50d6d811c2268f881e3666f4c67.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into html_input_datetime_1
Diffstat (limited to 'toolkit/modules')
| -rw-r--r-- | toolkit/modules/AppConstants.jsm | 7 | ||||
| -rw-r--r-- | toolkit/modules/NewTabUtils.jsm | 5 | ||||
| -rw-r--r-- | toolkit/modules/moz.build | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/toolkit/modules/AppConstants.jsm b/toolkit/modules/AppConstants.jsm index 8d9fa103c..ba5d82c01 100644 --- a/toolkit/modules/AppConstants.jsm +++ b/toolkit/modules/AppConstants.jsm @@ -204,13 +204,6 @@ this.AppConstants = Object.freeze({ false, #endif - E10S_TESTING_ONLY: -#ifdef E10S_TESTING_ONLY - true, -#else - false, -#endif - DEBUG: #ifdef DEBUG true, diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm index df8dae89d..e452a6fb2 100644 --- a/toolkit/modules/NewTabUtils.jsm +++ b/toolkit/modules/NewTabUtils.jsm @@ -249,10 +249,15 @@ var AllPages = { * Returns whether the history tiles are enhanced. */ get enhanced() { +#ifdef MC_BASILISK + // Hard-block the use of sponsored tiles. + return false; +#else if (this._enhanced === null) this._enhanced = Services.prefs.getBoolPref(PREF_NEWTAB_ENHANCED); return this._enhanced; +#endif }, /** diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index 257741274..60f3cc3da 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -57,7 +57,6 @@ EXTRA_JS_MODULES += [ 'Locale.jsm', 'Log.jsm', 'Memory.jsm', - 'NewTabUtils.jsm', 'NLP.jsm', 'ObjectUtils.jsm', 'PageMenu.jsm', @@ -104,6 +103,8 @@ EXTRA_JS_MODULES += [ EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js'] EXTRA_JS_MODULES.sessionstore += ['sessionstore/Utils.jsm'] +EXTRA_PP_JS_MODULES += ['NewTabUtils.jsm'] + if not CONFIG['MOZ_WEBEXTENSIONS']: EXTRA_PP_JS_MODULES += ['UpdateChannel.jsm'] |