diff --git a/javascript/webdriver/command.js b/javascript/webdriver/command.js index 5c3d95aac9c03..3db8443ffa13e 100644 --- a/javascript/webdriver/command.js +++ b/javascript/webdriver/command.js @@ -199,9 +199,9 @@ webdriver.CommandName = { // optional for these commands. CLICK: 'mouseClick', DOUBLE_CLICK: 'mouseDoubleClick', - MOUSE_DOWN: 'mouseDown', - MOUSE_UP: 'mouseUp', - MOVE_TO: 'mouseMove', + MOUSE_DOWN: 'mouseButtonDown', + MOUSE_UP: 'mouseButtonUp', + MOVE_TO: 'mouseMoveTo', SEND_KEYS_TO_ACTIVE_ELEMENT: 'sendKeysToActiveElement', // These belong to the Advanced Touch API diff --git a/javascript/webdriver/firefoxdomexecutor.js b/javascript/webdriver/firefoxdomexecutor.js index b581f67051c52..5b200cc01ec01 100644 --- a/javascript/webdriver/firefoxdomexecutor.js +++ b/javascript/webdriver/firefoxdomexecutor.js @@ -113,12 +113,9 @@ webdriver.FirefoxDomExecutor.prototype.execute = function(command, callback) { command.getName() != webdriver.CommandName.SWITCH_TO_FRAME) { parameters['id'] = parameters['id']['ELEMENT']; } - var json = goog.json.serialize({ 'name': command.getName(), - 'sessionId': { - 'value': parameters['sessionId'] - }, + 'sessionId': parameters['sessionId'], 'parameters': parameters }); this.docElement_.setAttribute(