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 /application | |
| 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 'application')
| -rw-r--r-- | application/basilisk/base/content/browser-syncui.js | 21 | ||||
| -rw-r--r-- | application/palemoon/base/content/browser-syncui.js | 17 |
2 files changed, 26 insertions, 12 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/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; |