Click Image with modifier

aaltat · aaltat · commit bae318f96d9d · 2018-12-18T09:55:25.000+02:00
diff --git a/atest/acceptance/keywords/click_element_modifier.robot b/atest/acceptance/keywords/click_element_modifier.robot
@@ -17,6 +17,10 @@ Click Button Modifier CTRL
     Click Button    Click me!    modifier=CTRL
     Element Text Should Be    output    CTRL click
 
+Click Image Modifier CTRL
+    Click Image    robot    modifier=CTRL
+    Element Text Should Be    output    CTRL click
+
 Click Element Modifier ALT
     Click Element    Button    alt
     Element Text Should Be    output    ALT click
diff --git a/atest/resources/html/javascript/click_modifier.html b/atest/resources/html/javascript/click_modifier.html
@@ -33,8 +33,9 @@
     <h1>Clicking with modifier</h1>
     <p id="info">Watch the output below</p>
     <p id="output">initial output</p>
-    <button type="button" id="Button" onmousedown="isKeyPressed(event)">Click me!</button>
-    <a href="popupwindow.html" onmousedown="isKeyPressed(event)" onClick="return popup(this, 'myName')">link text</a>
+    <button type="button" id="Button" onmousedown="isKeyPressed(event)">Click me!</button><br>
+    <a href="popupwindow.html" onmousedown="isKeyPressed(event)" onClick="return popup(this, 'myName')">link text</a><br>
+    <img src="../robot.png" id="robot" onmousedown="isKeyPressed(event)"><br>
 </body>
 </html>
 <!DOCTYPE html>
diff --git a/src/SeleniumLibrary/keywords/element.py b/src/SeleniumLibrary/keywords/element.py
@@ -526,22 +526,30 @@ def click_button(self, locator, modifier=False):
                 element = self.find_element(locator, tag='button')
             element.click()
         else:
-            self._click_with_modifier(locator, 'button', modifier)
+            self._click_with_modifier(locator, ['button', 'input'], modifier)
 
     @keyword
-    def click_image(self, locator):
+    def click_image(self, locator, modifier=False):
         """Clicks an image identified by ``locator``.
 
         See the `Locating elements` section for details about the locator
         syntax. When using the default locator strategy, images are searched
         using ``id``, ``name``, ``src`` and ``alt``.
+
+        See the `Click Element` keyword for details about the
+        ``modifier`` argument.
+
+        The ``modifier`` argument is new in SeleniumLibrary 3.3
         """
-        self.info("Clicking image '%s'." % locator)
-        element = self.find_element(locator, tag='image', required=False)
-        if not element:
-            # A form may have an image as it's submit trigger.
-            element = self.find_element(locator, tag='input')
-        element.click()
+        if is_falsy(modifier):
+            self.info("Clicking image '%s'." % locator)
+            element = self.find_element(locator, tag='image', required=False)
+            if not element:
+                # A form may have an image as it's submit trigger.
+                element = self.find_element(locator, tag='input')
+            element.click()
+        else:
+            self._click_with_modifier(locator, ['image', 'input'], modifier)
 
     @keyword
     def click_link(self, locator, modifier=False):
@@ -560,7 +568,7 @@ def click_link(self, locator, modifier=False):
             self.info("Clicking link '%s'." % locator)
             self.find_element(locator, tag='link').click()
         else:
-            self._click_with_modifier(locator, 'link', modifier)
+            self._click_with_modifier(locator, ['link', 'link'], modifier)
 
     @keyword
     def click_element(self, locator, modifier=False):
@@ -589,15 +597,18 @@ def click_element(self, locator, modifier=False):
             self.info("Clicking element '%s'." % locator)
             self.find_element(locator).click()
         else:
-            self._click_with_modifier(locator, None, modifier)
+            self._click_with_modifier(locator, [None, None], modifier)
 
     def _click_with_modifier(self, locator, tag, modifier):
-        self.info("Clicking %s '%s' with %s." % (tag if tag else 'element', locator, modifier))
+        self.info("Clicking %s '%s' with %s." % (tag if tag[0] else 'element', locator, modifier))
         modifier = self.parse_modifier(modifier)
         action = ActionChains(self.driver)
         for item in modifier:
             action.key_down(item)
-        action.click(self.find_element(locator, tag=tag))
+        element = self.find_element(locator, tag=tag[0], required=False)
+        if not element:
+            element = self.find_element(locator, tag=tag[1])
+        action.click(element)
         for item in modifier:
             action.key_up(item)
         action.perform()
