mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix buttons in proxy redirect notification box

Browse source
This commit is contained in:
Dan Stillman 2016-04-16 14:22:11 -04:00
parent 0fca78bb7e
commit d8850b25c2
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
chrome/content/zotero/xpcom/proxy.js
View file

@ -134,7 +134,13 @@ Zotero.Proxies = new function() {
browser,
window,
Zotero.getString('proxies.notification.associated.label', [host, channel.URI.hostPort]),
[{ label: "proxies.notification.settings.button", callback: function() { _prefsOpenCallback(bw[1]); } }]);
[
{
label: "proxies.notification.settings.button",
callback: () => _prefsOpenCallback(window)
}
]
);
}
} else {
if (!browser) return;
@ -263,9 +269,16 @@ Zotero.Proxies = new function() {
window,
Zotero.getString('proxies.notification.redirected.label', [channel.URI.hostPort, proxiedURI.hostPort]),
[
{ label: "general.dontShowAgain", callback: function() { _disableRedirectNotification(); } },
{ label: "proxies.notification.settings.button", callback: function() { _prefsOpenCallback(bw[1]); } }
]);
{
label: "general.dontShowAgain",
callback: () => _disableRedirectNotification()
},
{
label: "proxies.notification.settings.button",
callback: () => _prefsOpenCallback(window)
}
]
);
}
browser.loadURIWithFlags(proxied, 0, channel.URI, null, null);
@ -464,11 +477,13 @@ Zotero.Proxies = new function() {
/**
* Show a proxy-related notification
* @param {Array} bw output of _getBrowserWindow
* @param {String} label notification text
* @param {Array} buttons dicts of button label resource string and associated callback
* @param {Browser} browser
* @param {Window} window
* @param {String} label - notification text
* @param {Object[]} buttons - Array of objects with 'label' (for getString()) and 'callback'
*/
function _showNotification(browser, window, label, buttons) {
// Get localized button labels
buttons = buttons.map(function(button) {
return {
label: Zotero.getString(button.label),