diff options
author | Matt A. Tobin <email@mattatobin.com> | 2019-04-21 13:10:31 -0400 |
---|---|---|
committer | Matt A. Tobin <email@mattatobin.com> | 2019-04-21 13:10:31 -0400 |
commit | ccd86d8c0b234ebb3d95ec3eb0222a9e555c673c (patch) | |
tree | c4ec7c09834f08bc3e0f39095a127c0b3f28ba6d | |
parent | 5d02c22076b3c1350fd46b3596a839fa915033a2 (diff) | |
download | UXP-ccd86d8c0b234ebb3d95ec3eb0222a9e555c673c.tar UXP-ccd86d8c0b234ebb3d95ec3eb0222a9e555c673c.tar.gz UXP-ccd86d8c0b234ebb3d95ec3eb0222a9e555c673c.tar.lz UXP-ccd86d8c0b234ebb3d95ec3eb0222a9e555c673c.tar.xz UXP-ccd86d8c0b234ebb3d95ec3eb0222a9e555c673c.zip |
Issue #1049 - Show sync status via label of sync-button
-rw-r--r-- | application/basilisk/base/content/browser-syncui.js | 15 | ||||
-rw-r--r-- | application/palemoon/base/content/browser-syncui.js | 15 | ||||
-rw-r--r-- | services/sync/locales/en-US/sync.properties | 1 |
3 files changed, 25 insertions, 6 deletions
diff --git a/application/basilisk/base/content/browser-syncui.js b/application/basilisk/base/content/browser-syncui.js index ee84391b3..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() { diff --git a/application/palemoon/base/content/browser-syncui.js b/application/palemoon/base/content/browser-syncui.js index b9a3db2eb..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() { 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 |