corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 931534 - Make back/forward dropdowns work using CPOWs (r=felipe)

Browse Source
This commit is contained in:
Bill McCloskey
2013-10-28 12:24:51 -07:00
parent fc452dc482
commit fa865fc288
3 changed files with 69 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
toolkit/content/browser-child.js
View File

@@ -114,6 +114,10 @@ let WebNavigation = {
addMessageListener("WebNavigation:LoadURI", this);
addMessageListener("WebNavigation:Reload", this);
addMessageListener("WebNavigation:Stop", this);
// Send a CPOW for the sessionHistory object.
let history = this._webNavigation.sessionHistory;
sendAsyncMessage("WebNavigation:setHistory", {}, {history: history});
},
receiveMessage: function(message) {
@@ -125,16 +129,16 @@ let WebNavigation = {
this.goForward();
break;
case "WebNavigation:GotoIndex":
this.gotoIndex(message);
this.gotoIndex(message.data.index);
break;
case "WebNavigation:LoadURI":
this.loadURI(message);
this.loadURI(message.data.uri, message.data.flags);
break;
case "WebNavigation:Reload":
this.reload(message);
this.reload(message.data.flags);
break;
case "WebNavigation:Stop":
this.stop(message);
this.stop(message.data.flags);
break;
}
},
@@ -149,22 +153,19 @@ let WebNavigation = {
this._webNavigation.goForward();
},
gotoIndex: function(message) {
this._webNavigation.gotoIndex(message.index);
gotoIndex: function(index) {
this._webNavigation.gotoIndex(index);
},
loadURI: function(message) {
let flags = message.json.flags || this._webNavigation.LOAD_FLAGS_NONE;
this._webNavigation.loadURI(message.json.uri, flags, null, null, null);
loadURI: function(uri, flags) {
this._webNavigation.loadURI(uri, flags, null, null, null);
},
reload: function(message) {
let flags = message.json.flags || this._webNavigation.LOAD_FLAGS_NONE;
reload: function(flags) {
this._webNavigation.reload(flags);
},
stop: function(message) {
let flags = message.json.flags || this._webNavigation.STOP_ALL;
stop: function(flags) {
this._webNavigation.stop(flags);
}
};