Bug 1417597 - Show a different feedback message in send tab when we're offline. r=jaws

MozReview-Commit-ID: Emsx0LwFAE1

--HG--
extra : rebase_source : a10a5795f0c4c140a5d9eea5c72821be4931bd9b
This commit is contained in:
Edouard Oger 2017-11-16 16:11:46 -05:00
Родитель a004052a6e
Коммит 80589e1731
4 изменённых файлов: 11 добавлений и 4 удалений

Просмотреть файл

@ -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;

Просмотреть файл

@ -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;

Просмотреть файл

@ -436,7 +436,8 @@
tabspecific="true"
noautofocus="true"
copyURLFeedback="&copyURLFeedback.label;"
sendToDeviceFeedback="&sendToDeviceFeedback.label;">
sendToDeviceFeedback="&sendToDeviceFeedback.label;"
sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
<hbox id="pageActionFeedbackAnimatableBox">
<image id="pageActionFeedbackAnimatableImage"/>
</hbox>

Просмотреть файл

@ -51,6 +51,7 @@ can reach it easily. -->
<!ENTITY sendLinkToDevice.label "Send Link to Device">
<!ENTITY sendLinkToDevice.accesskey "n">
<!ENTITY sendToDeviceFeedback.label "Sent!">
<!ENTITY sendToDeviceOfflineFeedback.label "Queued (offline)">
<!ENTITY moveToNewWindow.label "Move to New Window">
<!ENTITY moveToNewWindow.accesskey "W">
<!ENTITY bookmarkAllTabs.label "Bookmark All Tabs…">