Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1197131: Use dispatcher for listener getCurrentUrl

Browse Source 
r=dburns

--HG--
extra : commitid : 4Xc1sCPhKIj
extra : rebase_source : 42479a1cab75575ba6dae4a6c0b0cf98d1652582
This commit is contained in:
Andreas Tolfsen 2015-08-21 10:57:06 +01:00
parent 94185c580b
commit 1bb1ddb8be
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
testing/marionette/driver.js
View File

@ -1288,7 +1288,7 @@ GeckoDriver.prototype.getCurrentUrl = function(cmd, resp) {
case Context.CONTENT:
let isB2G = this.appName == "B2G";
resp.value = yield this.listener.getCurrentUrl({isB2G: isB2G});
resp.value = yield this.listener.getCurrentUrl(isB2G);
break;
}
};

18
testing/marionette/listener.js
View File

@ -1,4 +1,3 @@
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
@ -192,6 +191,7 @@ let getElementTextFn = dispatch(getElementText);
let getElementTagNameFn = dispatch(getElementTagName);
let getElementRectFn = dispatch(getElementRect);
let isElementEnabledFn = dispatch(isElementEnabled);
let getCurrentUrlFn = dispatch(getCurrentUrl);
/**
* Start all message listeners
@ -208,7 +208,7 @@ function startListeners() {
addMessageListenerId("Marionette:get", get);
addMessageListenerId("Marionette:pollForReadyState", pollForReadyState);
addMessageListenerId("Marionette:cancelRequest", cancelRequest);
addMessageListenerId("Marionette:getCurrentUrl", getCurrentUrl);
addMessageListenerId("Marionette:getCurrentUrl", getCurrentUrlFn);
addMessageListenerId("Marionette:getTitle", getTitle);
addMessageListenerId("Marionette:getPageSource", getPageSource);
addMessageListenerId("Marionette:goBack", goBack);
@ -315,7 +315,7 @@ function deleteSession(msg) {
removeMessageListenerId("Marionette:cancelRequest", cancelRequest);
removeMessageListenerId("Marionette:getTitle", getTitle);
removeMessageListenerId("Marionette:getPageSource", getPageSource);
removeMessageListenerId("Marionette:getCurrentUrl", getCurrentUrl);
removeMessageListenerId("Marionette:getCurrentUrl", getCurrentUrlFn);
removeMessageListenerId("Marionette:goBack", goBack);
removeMessageListenerId("Marionette:goForward", goForward);
removeMessageListenerId("Marionette:refresh", refresh);
@ -1321,16 +1321,14 @@ function cancelRequest() {
}
/**
* Get URL of the top level browsing context.
* Get URL of the top-level browsing context.
*/
function getCurrentUrl(msg) {
let url;
if (msg.json.isB2G) {
url = curFrame.location.href;
function getCurrentUrl(isB2G) {
if (isB2G) {
return curFrame.location.href;
} else {
url = content.location.href;
return content.location.href;
}
sendResponse({value: url}, msg.json.command_id);
}
/**