diff options
| -rw-r--r-- | components/script/dom/htmlbuttonelement.rs | 4 | ||||
| -rw-r--r-- | components/script/dom/htmlformelement.rs | 16 | ||||
| -rw-r--r-- | components/script/dom/htmlinputelement.rs | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index e15d559cee3..23b9b79cc5d 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -266,14 +266,14 @@ impl Activatable for HTMLButtonElement { ButtonType::Submit => { // TODO: is document owner fully active? if let Some(owner) = self.form_owner() { - owner.submit(SubmittedFrom::NotFromFormSubmitMethod, + owner.submit(SubmittedFrom::NotFromForm, FormSubmitter::ButtonElement(self.clone())); } } ButtonType::Reset => { // TODO: is document owner fully active? if let Some(owner) = self.form_owner() { - owner.reset(ResetFrom::NotFromFormResetMethod); + owner.reset(ResetFrom::NotFromForm); } } _ => (), diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 30ab440b00e..66121a422bb 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -155,12 +155,12 @@ impl HTMLFormElementMethods for HTMLFormElement { // https://html.spec.whatwg.org/multipage/#the-form-element:concept-form-submit fn Submit(&self) { - self.submit(SubmittedFrom::FromFormSubmitMethod, FormSubmitter::FormElement(self)); + self.submit(SubmittedFrom::FromForm, FormSubmitter::FormElement(self)); } // https://html.spec.whatwg.org/multipage/#dom-form-reset fn Reset(&self) { - self.reset(ResetFrom::FromFormResetMethod); + self.reset(ResetFrom::FromForm); } // https://html.spec.whatwg.org/multipage/#dom-form-elements @@ -233,14 +233,14 @@ impl HTMLFormElementMethods for HTMLFormElement { #[derive(Copy, Clone, HeapSizeOf, PartialEq)] pub enum SubmittedFrom { - FromFormSubmitMethod, - NotFromFormSubmitMethod + FromForm, + NotFromForm } #[derive(Copy, Clone, HeapSizeOf)] pub enum ResetFrom { - FromFormResetMethod, - NotFromFormResetMethod + FromForm, + NotFromForm } @@ -368,7 +368,7 @@ impl HTMLFormElement { let base = doc.url(); // TODO: Handle browsing contexts // Step 4 - if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod && + if submit_method_flag == SubmittedFrom::NotFromForm && !submitter.no_validate(self) { if self.interactive_validation().is_err() { @@ -378,7 +378,7 @@ impl HTMLFormElement { } } // Step 5 - if submit_method_flag == SubmittedFrom::NotFromFormSubmitMethod { + if submit_method_flag == SubmittedFrom::NotFromForm { let event = self.upcast::<EventTarget>() .fire_event("submit", EventBubbles::Bubbles, diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index c9efb81ea7e..04fc98a3982 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -1091,7 +1091,7 @@ impl Activatable for HTMLInputElement { // FIXME (Manishearth): support document owners (needs ability to get parent browsing context) // Check if document owner is fully active self.form_owner().map(|o| { - o.submit(SubmittedFrom::NotFromFormSubmitMethod, + o.submit(SubmittedFrom::NotFromForm, FormSubmitter::InputElement(self.clone())) }); }, @@ -1100,7 +1100,7 @@ impl Activatable for HTMLInputElement { // FIXME (Manishearth): support document owners (needs ability to get parent browsing context) // Check if document owner is fully active self.form_owner().map(|o| { - o.reset(ResetFrom::NotFromFormResetMethod) + o.reset(ResetFrom::NotFromForm) }); }, InputType::InputCheckbox | InputType::InputRadio => { @@ -1204,7 +1204,7 @@ impl Activatable for HTMLInputElement { // lazily test for > 1 submission-blocking inputs return; } - form.submit(SubmittedFrom::NotFromFormSubmitMethod, + form.submit(SubmittedFrom::NotFromForm, FormSubmitter::FormElement(form.r())); } } |