diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 01:21:47 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-22 01:21:47 +0200 |
| commit | 1d7664d3a1db098024c7624650b0d272a26635e0 (patch) | |
| tree | 5037a43d5b3558850256f3f0d13a85bff1320064 /toolkit | |
| parent | 33ebc885e220eb6bb1062a429bbf0cd94c3878ae (diff) | |
| parent | 864f1cfdb2a10ad0dcd87dd429b2f477d6d27b8c (diff) | |
| download | UXP-1d7664d3a1db098024c7624650b0d272a26635e0.tar UXP-1d7664d3a1db098024c7624650b0d272a26635e0.tar.gz UXP-1d7664d3a1db098024c7624650b0d272a26635e0.tar.lz UXP-1d7664d3a1db098024c7624650b0d272a26635e0.tar.xz UXP-1d7664d3a1db098024c7624650b0d272a26635e0.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/components/viewsource/content/viewSource-content.js | 3 | ||||
| -rw-r--r-- | toolkit/modules/UpdateUtils.jsm | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/toolkit/components/viewsource/content/viewSource-content.js b/toolkit/components/viewsource/content/viewSource-content.js index 70d23eaa4..bad90febf 100644 --- a/toolkit/components/viewsource/content/viewSource-content.js +++ b/toolkit/components/viewsource/content/viewSource-content.js @@ -128,8 +128,7 @@ var ViewSourceContent = { let objects = msg.objects; switch (msg.name) { case "ViewSource:LoadSource": - this.viewSource(data.URL, data.outerWindowID, data.lineNumber, - data.shouldWrap); + this.viewSource(data.URL, data.outerWindowID, data.lineNumber); break; case "ViewSource:LoadSourceOriginal": this.viewSourceOriginal(data.URL, objects.pageDescriptor, data.lineNumber, diff --git a/toolkit/modules/UpdateUtils.jsm b/toolkit/modules/UpdateUtils.jsm index fed7c7637..4e796a2da 100644 --- a/toolkit/modules/UpdateUtils.jsm +++ b/toolkit/modules/UpdateUtils.jsm @@ -31,9 +31,9 @@ this.UpdateUtils = { * Whether or not to include the partner bits. Default: true. */ getUpdateChannel(aIncludePartners = true) { + let defaults = Services.prefs.getDefaultBranch(null); let channel = defaults.getCharPref("app.update.channel", AppConstants.MOZ_UPDATE_CHANNEL); - let defaults = Services.prefs.getDefaultBranch(null); if (aIncludePartners) { try { |