diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-02-04 01:44:41 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-02-04 01:44:41 +0000 |
| commit | d4c86a8319cc469bfb7036a2ecb439b35be1a833 (patch) | |
| tree | 68692b1038e23177b526f8ef496a4506a197054e /modules | |
| parent | 097fa969802f76530384926e8ef1f56777be3783 (diff) | |
| download | aura-central-d4c86a8319cc469bfb7036a2ecb439b35be1a833.tar.gz | |
Issue %3060 - Resolve remaining RELEASE_OR_BETA conditionals.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/AppConstants.jsm | 17 | ||||
| -rw-r--r-- | modules/webrequest/WebRequest.jsm | 5 |
2 files changed, 4 insertions, 18 deletions
diff --git a/modules/AppConstants.jsm b/modules/AppConstants.jsm index 2fcf9d1a8..5a340e355 100644 --- a/modules/AppConstants.jsm +++ b/modules/AppConstants.jsm @@ -17,21 +17,10 @@ this.EXPORTED_SYMBOLS = ["AppConstants"]; // Immutable for export. this.AppConstants = Object.freeze({ - // See this wiki page for more details about channel specific build - // defines: https://wiki.mozilla.org/Platform/Channel-specific_build_defines - NIGHTLY_BUILD: -#ifdef NIGHTLY_BUILD - true, -#else - false, -#endif - RELEASE_OR_BETA: -#ifdef RELEASE_OR_BETA - true, -#else - false, -#endif + // We don't use nightly or alpha channels here. Flag all as release. + NIGHTLY_BUILD: false + RELEASE_OR_BETA: true ACCESSIBILITY: #ifdef ACCESSIBILITY diff --git a/modules/webrequest/WebRequest.jsm b/modules/webrequest/WebRequest.jsm index 26118e43f..b9f9e7b65 100644 --- a/modules/webrequest/WebRequest.jsm +++ b/modules/webrequest/WebRequest.jsm @@ -839,10 +839,7 @@ HttpObserverManager = { var onBeforeRequest = { get allowedOptions() { delete this.allowedOptions; - this.allowedOptions = ["blocking"]; -#ifndef RELEASE_OR_BETA - this.allowedOptions.push("requestBody"); -#endif + this.allowedOptions = ["blocking", "requestBody"]; return this.allowedOptions; }, addListener(callback, filter = null, opt_extraInfoSpec = null) { |