Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

This commit refactors ctrlKey to ctrl_key wherever possible.

Browse source
This commit is contained in:
Arthur Marble 2016-09-17 01:10:12 -05:00
parent 83f687a7be
commit 77170a14bc
6 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/activation.rs
View file

@ -62,7 +62,7 @@ pub enum ActivationSource {
// https://html.spec.whatwg.org/multipage/#run-synthetic-click-activation-steps // https://html.spec.whatwg.org/multipage/#run-synthetic-click-activation-steps
pub fn synthetic_click_activation(element: &Element, pub fn synthetic_click_activation(element: &Element,
ctrlKey: bool, ctrl_key: bool,
shiftKey: bool, shiftKey: bool,
altKey: bool, altKey: bool,
metaKey: bool, metaKey: bool,
@ -93,7 +93,7 @@ pub fn synthetic_click_activation(element: &Element,
0, 0,
0, 0,
0, 0,
ctrlKey, ctrl_key,
shiftKey, shiftKey,
altKey, altKey,
metaKey, metaKey,

2
components/script/dom/htmlanchorelement.rs
View file

@ -540,7 +540,7 @@ impl Activatable for HTMLAnchorElement {
} }
//TODO:https://html.spec.whatwg.org/multipage/#the-a-element //TODO:https://html.spec.whatwg.org/multipage/#the-a-element
fn implicit_submission(&self, _ctrlKey: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) { fn implicit_submission(&self, _ctrl_key: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) {
} }
} }

4
components/script/dom/htmlbuttonelement.rs
View file

@ -283,7 +283,7 @@ impl Activatable for HTMLButtonElement {
// https://html.spec.whatwg.org/multipage/#implicit-submission // https://html.spec.whatwg.org/multipage/#implicit-submission
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) { fn implicit_submission(&self, ctrl_key: bool, shiftKey: bool, altKey: bool, metaKey: bool) {
let doc = document_from_node(self); let doc = document_from_node(self);
let node = doc.upcast::<Node>(); let node = doc.upcast::<Node>();
let owner = self.form_owner(); let owner = self.form_owner();
@ -294,7 +294,7 @@ impl Activatable for HTMLButtonElement {
.filter_map(Root::downcast::<HTMLButtonElement>) .filter_map(Root::downcast::<HTMLButtonElement>)
.find(|r| r.form_owner() == owner) .find(|r| r.form_owner() == owner)
.map(|s| synthetic_click_activation(s.r().as_element(), .map(|s| synthetic_click_activation(s.r().as_element(),
ctrlKey, ctrl_key,
shiftKey, shiftKey,
altKey, altKey,
metaKey, metaKey,

4
components/script/dom/htmlinputelement.rs
View file

@ -1275,7 +1275,7 @@ impl Activatable for HTMLInputElement {
// https://html.spec.whatwg.org/multipage/#implicit-submission // https://html.spec.whatwg.org/multipage/#implicit-submission
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn implicit_submission(&self, ctrlKey: bool, shiftKey: bool, altKey: bool, metaKey: bool) { fn implicit_submission(&self, ctrl_key: bool, shiftKey: bool, altKey: bool, metaKey: bool) {
let doc = document_from_node(self); let doc = document_from_node(self);
let node = doc.upcast::<Node>(); let node = doc.upcast::<Node>();
let owner = self.form_owner(); let owner = self.form_owner();
@ -1295,7 +1295,7 @@ impl Activatable for HTMLInputElement {
Some(ref button) => { Some(ref button) => {
if button.is_instance_activatable() { if button.is_instance_activatable() {
synthetic_click_activation(button.as_element(), synthetic_click_activation(button.as_element(),
ctrlKey, ctrl_key,
shiftKey, shiftKey,
altKey, altKey,
metaKey, metaKey,

2
components/script/dom/htmllabelelement.rs
View file

@ -76,7 +76,7 @@ impl Activatable for HTMLLabelElement {
} }
// https://html.spec.whatwg.org/multipage/#implicit-submission // https://html.spec.whatwg.org/multipage/#implicit-submission
fn implicit_submission(&self, _ctrlKey: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) { fn implicit_submission(&self, _ctrl_key: bool, _shiftKey: bool, _altKey: bool, _metaKey: bool) {
//FIXME: Investigate and implement implicit submission for label elements //FIXME: Investigate and implement implicit submission for label elements
// Issue filed at https://github.com/servo/servo/issues/8263 // Issue filed at https://github.com/servo/servo/issues/8263
} }

4
components/script/dom/touchevent.rs
View file

@ -62,7 +62,7 @@ impl TouchEvent {
touches: &TouchList, touches: &TouchList,
changed_touches: &TouchList, changed_touches: &TouchList,
target_touches: &TouchList, target_touches: &TouchList,
ctrlKey: bool, ctrl_key: bool,
altKey: bool, altKey: bool,
shiftKey: bool, shiftKey: bool,
metaKey: bool) -> Root<TouchEvent> { metaKey: bool) -> Root<TouchEvent> {
@ -71,7 +71,7 @@ impl TouchEvent {
bool::from(canBubble), bool::from(canBubble),
bool::from(cancelable), bool::from(cancelable),
view, detail); view, detail);
ev.ctrl_key.set(ctrlKey); ev.ctrl_key.set(ctrl_key);
ev.alt_key.set(altKey); ev.alt_key.set(altKey);
ev.shift_key.set(shiftKey); ev.shift_key.set(shiftKey);
ev.meta_key.set(metaKey); ev.meta_key.set(metaKey);