зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1572590 - Indent conditionally-defined prefs in mobile.js. r=KrisWright
Differential Revision: https://phabricator.services.mozilla.com/D41316 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
8f4aafad33
Коммит
e39e833d20
|
@ -2,6 +2,10 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// Please indent all prefs defined within #ifdef/#ifndef conditions. This
|
||||
// improves readability, particular for conditional blocks that exceed a single
|
||||
// screen.
|
||||
|
||||
#filter substitution
|
||||
|
||||
// For browser.js element
|
||||
|
@ -393,11 +397,11 @@ pref("app.privacyURL", "https://www.mozilla.org/privacy/firefox/");
|
|||
pref("app.creditsURL", "https://www.mozilla.org/credits/");
|
||||
pref("app.channelURL", "https://www.mozilla.org/%LOCALE%/firefox/channel/");
|
||||
#if MOZ_UPDATE_CHANNEL == aurora
|
||||
pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%/auroranotes/");
|
||||
pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%/auroranotes/");
|
||||
#elif MOZ_UPDATE_CHANNEL == beta
|
||||
pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%beta/releasenotes/");
|
||||
pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%beta/releasenotes/");
|
||||
#else
|
||||
pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%/releasenotes/");
|
||||
pref("app.releaseNotesURL", "https://www.mozilla.com/%LOCALE%/mobile/%VERSION%/releasenotes/");
|
||||
#endif
|
||||
|
||||
// Name of alternate about: page for certificate errors (when undefined, defaults to about:neterror)
|
||||
|
@ -454,9 +458,8 @@ pref("app.update.autodownload", "wifi");
|
|||
pref("app.update.url.android", "https://aus5.mozilla.org/update/4/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%MOZ_VERSION%/update.xml");
|
||||
|
||||
#ifdef MOZ_UPDATER
|
||||
/* prefs used specifically for updating the app */
|
||||
pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");
|
||||
|
||||
/* prefs used specifically for updating the app */
|
||||
pref("app.update.channel", "@MOZ_UPDATE_CHANNEL@");
|
||||
#endif
|
||||
|
||||
// replace newlines with spaces on paste into single-line text boxes
|
||||
|
@ -775,7 +778,7 @@ pref("dom.push.serverURL", "https://updates.push.services.mozilla.com/v1/gcm/@MO
|
|||
pref("dom.push.maxRecentMessageIDsPerSubscription", 0);
|
||||
|
||||
#ifdef MOZ_ANDROID_GCM
|
||||
pref("dom.push.enabled", true);
|
||||
pref("dom.push.enabled", true);
|
||||
#endif
|
||||
|
||||
// The remote content URL where FxAccountsWebChannel messages originate. Must use HTTPS.
|
||||
|
|
Загрузка…
Ссылка в новой задаче