diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js index 985ece77096a..135b3ff79deb 100644 --- a/browser/base/content/browser-pageActions.js +++ b/browser/base/content/browser-pageActions.js @@ -872,8 +872,8 @@ var BrowserPageActionFeedback = { return this.feedbackLabel = document.getElementById("pageActionFeedbackMessage"); }, - show(action, event) { - this.feedbackLabel.textContent = this.panelNode.getAttribute(action.id + "Feedback"); + show(action, event, textContentOverride) { + this.feedbackLabel.textContent = this.panelNode.getAttribute((textContentOverride || action.id) + "Feedback"); this.panelNode.hidden = false; let anchor = BrowserPageActions.panelAnchorNodeForAction(action, event); @@ -994,7 +994,8 @@ BrowserPageActions.sendToDevice = { // in", "Learn about Sync", etc. Device items will be .sendtab-target. if (event.target.classList.contains("sendtab-target")) { let action = PageActions.actionForID("sendToDevice"); - BrowserPageActionFeedback.show(action, event); + let textOverride = gSync.offline && "sendToDeviceOffline"; + BrowserPageActionFeedback.show(action, event, textOverride); } }); return item; diff --git a/browser/base/content/browser-sync.js b/browser/base/content/browser-sync.js index 83f406a77772..1e2001b82566 100644 --- a/browser/base/content/browser-sync.js +++ b/browser/base/content/browser-sync.js @@ -65,6 +65,10 @@ var gSync = { .sort((a, b) => a.name.localeCompare(b.name)); }, + get offline() { + return Weave.Service.scheduler.offline; + }, + _generateNodeGetters() { for (let k of ["Status", "Avatar", "Label", "Container"]) { let prop = "appMenu" + k; diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 596c34e4ad7e..9fadff7a01f0 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -436,7 +436,8 @@ tabspecific="true" noautofocus="true" copyURLFeedback="©URLFeedback.label;" - sendToDeviceFeedback="&sendToDeviceFeedback.label;"> + sendToDeviceFeedback="&sendToDeviceFeedback.label;" + sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;"> diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd index a727199b00cb..18b97175b288 100644 --- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -51,6 +51,7 @@ can reach it easily. --> +