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 877200 - Make history menu use async prompts. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston 2013-06-03 09:20:45 -07:00
parent 7eebca6e69
commit 8c49bb4fbe
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,7 +249,6 @@ var BrowserApp = {
_tabs: [],
_selectedTab: null,
_prefObservers: [],
_promptHandlers: {},
get isTablet() {
let sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
@ -299,7 +298,6 @@ var BrowserApp = {
Services.obs.addObserver(this, "FormHistory:Init", false);
Services.obs.addObserver(this, "gather-telemetry", false);
Services.obs.addObserver(this, "keyword-search", false);
Services.obs.addObserver(this, "Prompt:Reply", false);
Services.obs.addObserver(this, "sessionstore-state-purge-complete", false);
@ -1428,18 +1426,6 @@ var BrowserApp = {
browser.contentDocument.mozCancelFullScreen();
break;
case "Prompt:Reply":
{
let data = JSON.parse(aData);
let guid = data.guid;
let handler = this._promptHandlers[guid];
if (!handler)
break;
this._promptHandlers[guid];
handler(data);
}
break;
case "Viewport:Change":
if (this.isBrowserContentDocumentDisplayed())
this.selectedTab.setViewport(JSON.parse(aData));
@ -1504,35 +1490,26 @@ var BrowserApp = {
// selecting selIndex(if fromIndex<=selIndex<=toIndex)
showHistory: function(fromIndex, toIndex, selIndex) {
let browser = this.selectedBrowser;
let guid = uuidgen.generateUUID().toString();
let result = {
type: "Prompt:Show",
multiple: false,
async: true,
guid: guid,
selected: [],
listitems: []
};
let hist = browser.sessionHistory;
let listitems = [];
for (let i = toIndex; i >= fromIndex; i--) {
let entry = hist.getEntryAtIndex(i, false);
let item = {
label: entry.title || entry.URI.spec,
isGroup: false,
inGroup: false,
disabled: false,
id: i
selected: (i == selIndex)
};
result.listitems.push(item);
result.selected.push(i == selIndex);
listitems.push(item);
}
this._promptHandlers[guid] = function (data) {
let p = new Prompt({
window: browser.contentWindow
}).setSingleChoiceItems(listitems).show(function(data) {
let selected = data.button;
if (selected == -1)
return;
browser.gotoIndex(toIndex-selected);
};
sendMessageToJava(result);
});
},
};