diff options
| -rw-r--r-- | application/basilisk/base/content/browser-syncui.js | 21 | ||||
| -rw-r--r-- | application/basilisk/fonts/TwemojiMozilla.ttf | bin | 1057104 -> 1158828 bytes | |||
| -rw-r--r-- | application/palemoon/base/content/browser-syncui.js | 17 | ||||
| -rw-r--r-- | application/palemoon/fonts/TwemojiMozilla.ttf | bin | 1075912 -> 1158828 bytes | |||
| -rw-r--r-- | config/milestone.txt | 2 | ||||
| -rw-r--r-- | services/sync/locales/en-US/sync.properties | 1 | ||||
| -rw-r--r-- | toolkit/components/viewsource/content/viewSource-content.js | 3 | ||||
| -rw-r--r-- | toolkit/modules/UpdateUtils.jsm | 2 |
8 files changed, 30 insertions, 16 deletions
diff --git a/application/basilisk/base/content/browser-syncui.js b/application/basilisk/base/content/browser-syncui.js index d0f46247a..f57472658 100644 --- a/application/basilisk/base/content/browser-syncui.js +++ b/application/basilisk/base/content/browser-syncui.js @@ -93,17 +93,25 @@ var gSyncUI = { document.getElementById("sync-setup-state").hidden = !needsSetup; document.getElementById("sync-syncnow-state").hidden = needsSetup; - if (!gBrowser) + if (!gBrowser) { return; + } let button = document.getElementById("sync-button"); - if (!button) + if (!button) { return; + } button.removeAttribute("status"); + this._updateLastSyncTime(); - if (needsSetup) + + if (needsSetup) { button.removeAttribute("tooltiptext"); + button.setAttribute("label", this._stringBundle.GetStringFromName("setupsync.label")); + } else { + button.setAttribute("label", this._stringBundle.GetStringFromName("syncnow.label")); + } }, @@ -117,6 +125,7 @@ var gSyncUI = { return; button.setAttribute("status", "active"); + button.setAttribute("label", this._stringBundle.GetStringFromName("syncing2.label")); }, onSyncDelay: function SUI_onSyncDelay() { @@ -281,11 +290,7 @@ var gSyncUI = { if (!syncButton) return; - let lastSync; - try { - lastSync = Services.prefs.getCharPref("services.sync.lastSync"); - } - catch (e) { }; + let lastSync = Services.prefs.getCharPref("services.sync.lastSync", ""); if (!lastSync || this._needsSetup()) { syncButton.removeAttribute("tooltiptext"); return; diff --git a/application/basilisk/fonts/TwemojiMozilla.ttf b/application/basilisk/fonts/TwemojiMozilla.ttf Binary files differindex 1933891d9..c47cbbf11 100644 --- a/application/basilisk/fonts/TwemojiMozilla.ttf +++ b/application/basilisk/fonts/TwemojiMozilla.ttf diff --git a/application/palemoon/base/content/browser-syncui.js b/application/palemoon/base/content/browser-syncui.js index 6fad03cdd..86f6f48f1 100644 --- a/application/palemoon/base/content/browser-syncui.js +++ b/application/palemoon/base/content/browser-syncui.js @@ -93,17 +93,25 @@ var gSyncUI = { document.getElementById("sync-setup-state").hidden = !needsSetup; document.getElementById("sync-syncnow-state").hidden = needsSetup; - if (!gBrowser) + if (!gBrowser) { return; + } let button = document.getElementById("sync-button"); - if (!button) + if (!button) { return; + } button.removeAttribute("status"); + this._updateLastSyncTime(); - if (needsSetup) + + if (needsSetup) { button.removeAttribute("tooltiptext"); + button.setAttribute("label", this._stringBundle.GetStringFromName("setupsync.label")); + } else { + button.setAttribute("label", this._stringBundle.GetStringFromName("syncnow.label")); + } }, @@ -117,6 +125,7 @@ var gSyncUI = { return; button.setAttribute("status", "active"); + button.setAttribute("label", this._stringBundle.GetStringFromName("syncing2.label")); }, onSyncDelay: function SUI_onSyncDelay() { @@ -282,7 +291,7 @@ var gSyncUI = { if (!syncButton) return; - let lastSync = Services.prefs.getCharPref("services.sync.lastSync"); + let lastSync = Services.prefs.getCharPref("services.sync.lastSync", ""); if (!lastSync || this._needsSetup()) { syncButton.removeAttribute("tooltiptext"); return; diff --git a/application/palemoon/fonts/TwemojiMozilla.ttf b/application/palemoon/fonts/TwemojiMozilla.ttf Binary files differindex 8139089f1..c47cbbf11 100644 --- a/application/palemoon/fonts/TwemojiMozilla.ttf +++ b/application/palemoon/fonts/TwemojiMozilla.ttf diff --git a/config/milestone.txt b/config/milestone.txt index f525cbbb4..7aab8cfcb 100644 --- a/config/milestone.txt +++ b/config/milestone.txt @@ -10,4 +10,4 @@ # hardcoded milestones in the tree from these two files. #-------------------------------------------------------- -4.1.10 +4.2.0 diff --git a/services/sync/locales/en-US/sync.properties b/services/sync/locales/en-US/sync.properties index 93369dd37..af40e125a 100644 --- a/services/sync/locales/en-US/sync.properties +++ b/services/sync/locales/en-US/sync.properties @@ -52,3 +52,4 @@ sync.eol.learnMore.accesskey = L syncnow.label = Sync Now syncing2.label = Syncing… +setupsync.label = Set Up Sync 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 { |