зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1197146: Part 6: Use dispatcher for listener clearElement
r=dburns --HG-- extra : commitid : 35gcrZxPUW5 extra : source : 35f1b9173ef480dedd1869ec5ed1d0cbfd7a9e1b
This commit is contained in:
Родитель
730495da38
Коммит
0a22490c2e
|
@ -2309,7 +2309,7 @@ GeckoDriver.prototype.clearElement = function(cmd, resp) {
|
|||
break;
|
||||
|
||||
case Context.CONTENT:
|
||||
yield this.listener.clearElement({id: id});
|
||||
yield this.listener.clearElement(id);
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -209,6 +209,7 @@ let findElementContentFn = dispatch(findElementContent);
|
|||
let findElementsContentFn = dispatch(findElementsContent);
|
||||
let isElementSelectedFn = dispatch(isElementSelected);
|
||||
let getElementLocationFn = dispatch(getElementLocation);
|
||||
let clearElementFn = dispatch(clearElement);
|
||||
|
||||
/**
|
||||
* Start all message listeners
|
||||
|
@ -246,7 +247,7 @@ function startListeners() {
|
|||
addMessageListenerId("Marionette:isElementSelected", isElementSelectedFn);
|
||||
addMessageListenerId("Marionette:sendKeysToElement", sendKeysToElement);
|
||||
addMessageListenerId("Marionette:getElementLocation", getElementLocationFn); //deprecated
|
||||
addMessageListenerId("Marionette:clearElement", clearElement);
|
||||
addMessageListenerId("Marionette:clearElement", clearElementFn);
|
||||
addMessageListenerId("Marionette:switchToFrame", switchToFrame);
|
||||
addMessageListenerId("Marionette:deleteSession", deleteSession);
|
||||
addMessageListenerId("Marionette:sleepSession", sleepSession);
|
||||
|
@ -351,7 +352,7 @@ function deleteSession(msg) {
|
|||
removeMessageListenerId("Marionette:isElementSelected", isElementSelectedFn);
|
||||
removeMessageListenerId("Marionette:sendKeysToElement", sendKeysToElement);
|
||||
removeMessageListenerId("Marionette:getElementLocation", getElementLocationFn);
|
||||
removeMessageListenerId("Marionette:clearElement", clearElement);
|
||||
removeMessageListenerId("Marionette:clearElement", clearElementFn);
|
||||
removeMessageListenerId("Marionette:switchToFrame", switchToFrame);
|
||||
removeMessageListenerId("Marionette:deleteSession", deleteSession);
|
||||
removeMessageListenerId("Marionette:sleepSession", sleepSession);
|
||||
|
@ -1641,25 +1642,24 @@ function getElementLocation(id) {
|
|||
}
|
||||
|
||||
/**
|
||||
* Clear the text of an element
|
||||
* Clear the text of an element.
|
||||
*/
|
||||
function clearElement(msg) {
|
||||
let command_id = msg.json.command_id;
|
||||
function clearElement(id) {
|
||||
try {
|
||||
let el = elementManager.getKnownElement(msg.json.id, curFrame);
|
||||
let el = elementManager.getKnownElement(id, curFrame);
|
||||
if (el.type == "file") {
|
||||
el.value = null;
|
||||
} else {
|
||||
utils.clearElement(el);
|
||||
}
|
||||
sendOk(command_id);
|
||||
} catch (e) {
|
||||
// Bug 964738: Newer atoms contain status codes which makes wrapping
|
||||
// this in an error prototype that has a status property unnecessary
|
||||
if (e.name == "InvalidElementStateError") {
|
||||
e = new InvalidElementStateError(e.message);
|
||||
throw new InvalidElementStateError(e.message);
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
sendError(e, command_id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче