Commit ad4ec417 authored by kkania@chromium.org's avatar kkania@chromium.org

[chromedriver] Cherrypick atoms fix for toggling multi select options.

BUG=none
R=chrisgao@chromium.org

Review URL: https://codereview.chromium.org/23531035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221408 0039d316-1c4b-4281-b951-d872f2087c98
parent 1e0b89a0
This source diff could not be displayed because it is too large. You can view the blob instead.
Index: javascript/chrome-driver/build.desc diff --git a/javascript/atoms/device.js b/javascript/atoms/device.js
=================================================================== index e2693f8..3731db3 100644
--- javascript/chrome-driver/build.desc (revision 18456) --- a/javascript/atoms/device.js
+++ javascript/chrome-driver/build.desc (working copy) +++ b/javascript/atoms/device.js
@@ -24,6 +24,11 @@ @@ -627,6 +627,7 @@ bot.Device.prototype.maybeToggleOption = function() {
// Only WebKit fires the change event itself and only for multi-selects,
// except for Android versions >= 4.0.
if (!(goog.userAgent.WEBKIT && select.multiple) ||
+ (goog.userAgent.product.CHROME && bot.userAgent.isProductVersion(28)) ||
(goog.userAgent.product.ANDROID && bot.userAgent.isProductVersion(4))) {
bot.events.fire(select, bot.events.EventType.CHANGE);
}
diff --git a/javascript/chrome-driver/build.desc b/javascript/chrome-driver/build.desc
index 423c450..1889095 100644
--- a/javascript/chrome-driver/build.desc
+++ b/javascript/chrome-driver/build.desc
@@ -24,6 +24,11 @@ js_fragment(name = "get_page_zoom",
function = "webdriver.chrome.getPageZoom", function = "webdriver.chrome.getPageZoom",
deps = [ ":deps" ]) deps = [ ":deps" ])
...@@ -14,7 +26,7 @@ Index: javascript/chrome-driver/build.desc ...@@ -14,7 +26,7 @@ Index: javascript/chrome-driver/build.desc
js_test(name = "test", js_test(name = "test",
srcs = [ "test/*_test.html" ], srcs = [ "test/*_test.html" ],
deps = [ deps = [
@@ -39,6 +44,7 @@ @@ -39,6 +44,7 @@ js_fragment_cpp(name = "atoms",
"//javascript/chrome-driver:get_location_in_view:chrome", "//javascript/chrome-driver:get_location_in_view:chrome",
"//javascript/chrome-driver:get_page_zoom:chrome", "//javascript/chrome-driver:get_page_zoom:chrome",
"//javascript/chrome-driver:is_element_clickable:chrome", "//javascript/chrome-driver:is_element_clickable:chrome",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment