Merge ffa530f into 284f1dd

spec/watirspec/elements/div_spec.rb

@@ -225,8 +225,8 @@
 
       it 'accepts modifiers' do
         browser.goto(WatirSpec.url_for('right_click.html'))
-        browser.div(id: 'click-logger').right_click(:shift, :alt)
-        expect(event_log.first).to eq('shift=true alt=true')
+        browser.div(id: 'click-logger').right_click(:control, :alt)
+        expect(event_log.first).to eq('ctrl=true alt=true')
       end
     end
   end

spec/watirspec/html/forms_with_input_elements.html

@@ -22,7 +22,7 @@ <h2 data-locator="add user" style="background-color: gray;">Add user</h2>
             <label for="new_user_last_name">Last name</label>
             <input type="no_such_type" name="new_user_last_name" id="new_user_last_name" class="name" data-locator="last name"/> <br />
             <label for="new_user_email">Email address</label>
-            <input type="text" name="new_user_email" id="new_user_email" data-locator="first text" contenteditable=""/> <br />
+            <input type="text" name="new_user_email" id="new_user_email" data-locator="first text"/> <br />
             <label for="new_user_email_confirm">Email address (confirmation)</label>
             <input type="Text" name="new_user_email_confirm" id="new_user_email_confirm" /> <br />
             <label for="new_user_country">Country</label>

spec/watirspec/html/right_click.html

@@ -8,7 +8,7 @@
   <script>
     $(document).ready(function() {
       $(document).on("contextmenu", "#click-logger", function(evt){
-        $("#log").append("<p>shift=" + evt.shiftKey + " alt=" + evt.altKey + "</p>");
+        $("#log").append("<p>ctrl=" + evt.ctrlKey + " alt=" + evt.altKey + "</p>");
         return false;
       });
     });