Refactored metaKey to meta_key where possible

servo · Sep 18, 2016 · 5ce3510 · 5ce3510
1 parent bdbc044
commit 5ce3510
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs
@@ -65,7 +65,7 @@ pub fn synthetic_click_activation(element: &Element,
                                   ctrl_key: bool,
                                   shift_key: bool,
                                   alt_key: bool,
-                                  metaKey: bool,
+                                  meta_key: bool,
                                   source: ActivationSource) {
     // Step 1
     if element.click_in_progress() {
@@ -96,7 +96,7 @@ pub fn synthetic_click_activation(element: &Element,
                                 ctrl_key,
                                 shift_key,
                                 alt_key,
-                                metaKey,
+                                meta_key,
                                 0,
                                 None);
     let event = mouse.upcast::<Event>();

diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs
@@ -540,7 +540,7 @@ impl Activatable for HTMLAnchorElement {
     }
 
     //TODO:https://html.spec.whatwg.org/multipage/#the-a-element
-    fn implicit_submission(&self, _ctrl_key: bool, _shift_key: bool, _alt_key: bool, _metaKey: bool) {
+    fn implicit_submission(&self, _ctrl_key: bool, _shift_key: bool, _alt_key: bool, _meta_key: bool) {
     }
 }
 

diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs
@@ -283,7 +283,7 @@ impl Activatable for HTMLButtonElement {
 
     // https://html.spec.whatwg.org/multipage/#implicit-submission
     #[allow(unsafe_code)]
-    fn implicit_submission(&self, ctrl_key: bool, shift_key: bool, alt_key: bool, metaKey: bool) {
+    fn implicit_submission(&self, ctrl_key: bool, shift_key: bool, alt_key: bool, meta_key: bool) {
         let doc = document_from_node(self);
         let node = doc.upcast::<Node>();
         let owner = self.form_owner();
@@ -297,7 +297,7 @@ impl Activatable for HTMLButtonElement {
                                                 ctrl_key,
                                                 shift_key,
                                                 alt_key,
-                                                metaKey,
+                                                meta_key,
                                                 ActivationSource::NotFromClick));
     }
 }
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
@@ -1275,7 +1275,7 @@ impl Activatable for HTMLInputElement {
 
     // https://html.spec.whatwg.org/multipage/#implicit-submission
     #[allow(unsafe_code)]
-    fn implicit_submission(&self, ctrl_key: bool, shift_key: bool, alt_key: bool, metaKey: bool) {
+    fn implicit_submission(&self, ctrl_key: bool, shift_key: bool, alt_key: bool, meta_key: bool) {
         let doc = document_from_node(self);
         let node = doc.upcast::<Node>();
         let owner = self.form_owner();
@@ -1298,7 +1298,7 @@ impl Activatable for HTMLInputElement {
                                                ctrl_key,
                                                shift_key,
                                                alt_key,
-                                               metaKey,
+                                               meta_key,
                                                ActivationSource::NotFromClick)
                 }
             }

diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs
@@ -76,7 +76,7 @@ impl Activatable for HTMLLabelElement {
     }
 
     // https://html.spec.whatwg.org/multipage/#implicit-submission
-    fn implicit_submission(&self, _ctrl_key: bool, _shift_key: bool, _alt_key: bool, _metaKey: bool) {
+    fn implicit_submission(&self, _ctrl_key: bool, _shift_key: bool, _alt_key: bool, _meta_key: bool) {
         //FIXME: Investigate and implement implicit submission for label elements
         // Issue filed at https://github.com/servo/servo/issues/8263
     }

diff --git a/components/script/dom/touchevent.rs b/components/script/dom/touchevent.rs
@@ -65,7 +65,7 @@ impl TouchEvent {
                ctrl_key: bool,
                alt_key: bool,
                shift_key: bool,
-               metaKey: bool) -> Root<TouchEvent> {
+               meta_key: bool) -> Root<TouchEvent> {
         let ev = TouchEvent::new_uninitialized(window, touches, changed_touches, target_touches);
         ev.upcast::<UIEvent>().InitUIEvent(type_,
                                            bool::from(canBubble),
@@ -74,7 +74,7 @@ impl TouchEvent {
         ev.ctrl_key.set(ctrl_key);
         ev.alt_key.set(alt_key);
         ev.shift_key.set(shift_key);
-        ev.meta_key.set(metaKey);
+        ev.meta_key.set(meta_key);
         ev
     }
 }