diff --git a/components/script/dom/activation.rs b/components/script/dom/activation.rs index 3f6b9890e4b..d0623740a63 100644 --- a/components/script/dom/activation.rs +++ b/components/script/dom/activation.rs @@ -64,7 +64,7 @@ pub enum ActivationSource { pub fn synthetic_click_activation(element: &Element, ctrl_key: bool, shift_key: bool, - altKey: bool, + alt_key: bool, metaKey: bool, source: ActivationSource) { // Step 1 @@ -95,7 +95,7 @@ pub fn synthetic_click_activation(element: &Element, 0, ctrl_key, shift_key, - altKey, + alt_key, metaKey, 0, None); diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index 9321764fece..e019d8ce285 100644 --- 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, _altKey: bool, _metaKey: bool) { + fn implicit_submission(&self, _ctrl_key: bool, _shift_key: bool, _alt_key: bool, _metaKey: bool) { } } diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 4bf1b9a16b5..e1e2a0ccd41 100644 --- 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, altKey: bool, metaKey: bool) { + fn implicit_submission(&self, ctrl_key: bool, shift_key: bool, alt_key: bool, metaKey: bool) { let doc = document_from_node(self); let node = doc.upcast::(); let owner = self.form_owner(); @@ -296,7 +296,7 @@ impl Activatable for HTMLButtonElement { .map(|s| synthetic_click_activation(s.r().as_element(), ctrl_key, shift_key, - altKey, + alt_key, metaKey, ActivationSource::NotFromClick)); } diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index a9f99ec20e1..8495481d108 100644 --- 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, altKey: bool, metaKey: bool) { + fn implicit_submission(&self, ctrl_key: bool, shift_key: bool, alt_key: bool, metaKey: bool) { let doc = document_from_node(self); let node = doc.upcast::(); let owner = self.form_owner(); @@ -1297,7 +1297,7 @@ impl Activatable for HTMLInputElement { synthetic_click_activation(button.as_element(), ctrl_key, shift_key, - altKey, + alt_key, metaKey, ActivationSource::NotFromClick) } diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index b1a4e1dfe5b..894a5bd1c24 100644 --- 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, _altKey: bool, _metaKey: bool) { + fn implicit_submission(&self, _ctrl_key: bool, _shift_key: bool, _alt_key: bool, _metaKey: 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 index 0a1aac87ecf..24fae301ac2 100644 --- a/components/script/dom/touchevent.rs +++ b/components/script/dom/touchevent.rs @@ -63,7 +63,7 @@ impl TouchEvent { changed_touches: &TouchList, target_touches: &TouchList, ctrl_key: bool, - altKey: bool, + alt_key: bool, shift_key: bool, metaKey: bool) -> Root { let ev = TouchEvent::new_uninitialized(window, touches, changed_touches, target_touches); @@ -72,7 +72,7 @@ impl TouchEvent { bool::from(cancelable), view, detail); ev.ctrl_key.set(ctrl_key); - ev.alt_key.set(altKey); + ev.alt_key.set(alt_key); ev.shift_key.set(shift_key); ev.meta_key.set(metaKey); ev