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 1197146: Part 8: Use dispatcher for listener getElementValueOfCssProperty

Browse Source 
r=dburns

--HG--
extra : commitid : 23PStMtVria
extra : source : 8fb6d7814dc28abe320354b59bac44a9779869cf
This commit is contained in:
Andreas Tolfsen 2015-08-21 16:10:02 +01:00
parent 3932cbc6d5
commit 92037e0876
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
testing/marionette/driver.js
View File

@ -2119,8 +2119,7 @@ GeckoDriver.prototype.getElementValueOfCssProperty = function(cmd, resp) {
break;
case Context.CONTENT:
resp.value = yield this.listener.getElementValueOfCssProperty(
{id: id, propertyName: prop});
resp.value = yield this.listener.getElementValueOfCssProperty(id, prop);
break;
}
};

33
testing/marionette/listener.js
View File

@ -211,6 +211,7 @@ let isElementSelectedFn = dispatch(isElementSelected);
let getElementLocationFn = dispatch(getElementLocation);
let clearElementFn = dispatch(clearElement);
let isElementDisplayedFn = dispatch(isElementDisplayed);
let getElementValueOfCssPropertyFn = dispatch(getElementValueOfCssProperty);
/**
* Start all message listeners
@ -241,7 +242,7 @@ function startListeners() {
addMessageListenerId("Marionette:getElementText", getElementTextFn);
addMessageListenerId("Marionette:getElementTagName", getElementTagNameFn);
addMessageListenerId("Marionette:isElementDisplayed", isElementDisplayedFn);
addMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssProperty);
addMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssPropertyFn);
addMessageListenerId("Marionette:getElementSize", getElementSizeFn); // deprecated
addMessageListenerId("Marionette:getElementRect", getElementRectFn);
addMessageListenerId("Marionette:isElementEnabled", isElementEnabledFn);
@ -346,7 +347,7 @@ function deleteSession(msg) {
removeMessageListenerId("Marionette:getElementText", getElementTextFn);
removeMessageListenerId("Marionette:getElementTagName", getElementTagNameFn);
removeMessageListenerId("Marionette:isElementDisplayed", isElementDisplayedFn);
removeMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssProperty);
removeMessageListenerId("Marionette:getElementValueOfCssProperty", getElementValueOfCssPropertyFn);
removeMessageListenerId("Marionette:getElementSize", getElementSizeFn); // deprecated
removeMessageListenerId("Marionette:getElementRect", getElementRectFn);
removeMessageListenerId("Marionette:isElementEnabled", isElementEnabledFn);
@ -1519,23 +1520,21 @@ function isElementDisplayed(id) {
}
/**
* Return the property of the computed style of an element
* Retrieves the computed value of the given CSS property of the given
* web element.
*
* @param object aRequest
* 'element' member holds the reference id to
* the element that will be checked
* 'propertyName' is the CSS rule that is being requested
* @param {String} id
* Web element reference.
* @param {String} prop
* The CSS property to get.
*
* @return {String}
* Effective value of the requested CSS property.
*/
function getElementValueOfCssProperty(msg) {
let command_id = msg.json.command_id;
let propertyName = msg.json.propertyName;
try {
let el = elementManager.getKnownElement(msg.json.id, curFrame);
sendResponse({value: curFrame.document.defaultView.getComputedStyle(el, null).getPropertyValue(propertyName)},
command_id);
} catch (e) {
sendError(e, command_id);
}
function getElementValueOfCssProperty(id, prop) {
let el = elementManager.getKnownElement(id, curFrame);
let st = curFrame.document.defaultView.getComputedStyle(el, null);
return st.getPropertyValue(prop);
}
/**