wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 959108 - Update helper apps page actions URL on location change. r=wesj

Browse Source
This commit is contained in:
Eugen Sawin 2014-02-26 22:38:09 +01:00
parent 5ef10eeaf9
commit 565e9da954
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mobile/android/chrome/content/browser.js
View File

@ -3930,6 +3930,11 @@ Tab.prototype = {
} catch (e) {}
}
// Update the page actions URI for helper apps.
if (BrowserApp.selectedTab == this) {
ExternalApps.updatePageActionUri(fixedURI);
}
let message = {
type: "Content:LocationChange",
tabID: this.id,
@ -7851,7 +7856,7 @@ let Reader = {
};
var ExternalApps = {
_contextMenuId: -1,
_contextMenuId: null,
// extend _getLink to pickup html5 media links.
_getMediaLink: function(aElement) {
@ -7883,7 +7888,10 @@ var ExternalApps = {
},
uninit: function helper_uninit() {
NativeWindow.contextmenus.remove(this._contextMenuId);
if (this._contextMenuId !== null) {
NativeWindow.contextmenus.remove(this._contextMenuId);
}
this._contextMenuId = null;
},
filter: {
@ -7919,8 +7927,12 @@ var ExternalApps = {
});
},
_setUriForPageAction: function setUriForPageAction(uri, apps) {
updatePageActionUri: function updatePageActionUri(uri) {
this._pageActionUri = uri;
},
_setUriForPageAction: function setUriForPageAction(uri, apps) {
this.updatePageActionUri(uri);
// If the pageaction is already added, simply update the URI to be launched when 'onclick' is triggered.
if (this._pageActionId != undefined)
@ -7929,11 +7941,8 @@ var ExternalApps = {
this._pageActionId = NativeWindow.pageactions.add({
title: Strings.browser.GetStringFromName("openInApp.pageAction"),
icon: "drawable://icon_openinapp",
clickCallback: (function() {
let callback = function(app) {
app.launch(uri);
}
clickCallback: () => {
if (apps.length > 1) {
// Use the HelperApps prompt here to filter out any Http handlers
HelperApps.prompt(apps, {
@ -7943,15 +7952,15 @@ var ExternalApps = {
Strings.browser.GetStringFromName("openInApp.cancel")
]
}, function(result) {
if (result.button != 0)
if (result.button != 0) {
return;
callback(apps[result.icongrid0]);
}
apps[result.icongrid0].launch(this._pageActionUri);
});
} else {
callback(apps[0]);
apps[0].launch(this._pageActionUri);
}
}).bind(this)
}
});
},