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 870063 - Make context menus use async prompt service. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston 2013-06-05 10:04:11 -07:00
parent 1aebad3cfa
commit 27ea33d1ef
1 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1889,10 +1889,8 @@ var NativeWindow = {
icon: item.icon,
label: item.label,
id: id,
isGroup: false,
inGroup: false,
disabled: item.disabled,
isParent: item instanceof Ci.nsIDOMHTMLMenuElement
parent: item instanceof Ci.nsIDOMHTMLMenuElement
}
}
};
@ -2017,36 +2015,36 @@ var NativeWindow = {
if (itemArray.length == 0)
return;
let msg = {
type: "Prompt:Show",
title: title,
listitems: itemArray
};
let data = JSON.parse(sendMessageToJava(msg));
if (data.button == -1) {
// prompt was cancelled
return;
}
let selectedId = itemArray[data.button].id;
let selectedItem = this._getMenuItemForId(selectedId);
this.menuitems = null;
if (selectedItem && selectedItem.callback) {
if (selectedItem.matches) {
// for menuitems added using the native UI, pass the dom element that matched that item to the callback
while (aTarget) {
if (selectedItem.matches(aTarget, aX, aY)) {
selectedItem.callback.call(selectedItem, aTarget, aX, aY);
break;
}
aTarget = aTarget.parentNode;
}
} else {
// if this was added using the html5 context menu api, just click on the context menu item
selectedItem.callback.call(selectedItem, aTarget, aX, aY);
let prompt = new Prompt({
window: aTarget.ownerDocument.defaultView,
title: title
}).setSingleChoiceItems(itemArray)
.show((function(data) {
if (data.button == -1) {
// prompt was cancelled
return;
}
}
let selectedId = itemArray[data.button].id;
let selectedItem = this._getMenuItemForId(selectedId);
this.menuitems = null;
if (selectedItem && selectedItem.callback) {
if (selectedItem.matches) {
// for menuitems added using the native UI, pass the dom element that matched that item to the callback
while (aTarget) {
if (selectedItem.matches(aTarget, aX, aY)) {
selectedItem.callback.call(selectedItem, aTarget, aX, aY);
break;
}
aTarget = aTarget.parentNode;
}
} else {
// if this was added using the html5 context menu api, just click on the context menu item
selectedItem.callback.call(selectedItem, aTarget, aX, aY);
}
}
}).bind(this));
},
handleEvent: function(aEvent) {