diff options
Diffstat (limited to 'components/script')
-rw-r--r-- | components/script/dom/htmlformelement.rs | 11 | ||||
-rw-r--r-- | components/script/dom/htmlinputelement.rs | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 49c3486a186..f19649427e4 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -116,19 +116,24 @@ impl<'a> HTMLFormElementMethods for JSRef<'a, HTMLFormElement> { // https://html.spec.whatwg.org/multipage/forms.html#the-form-element:concept-form-submit fn Submit(self) { - self.submit(true, FormElement(self)); + self.submit(FromFormSubmitMethod, FormElement(self)); } } +pub enum SubmittedFrom { + FromFormSubmitMethod, + NotFromFormSubmitMethod +} + pub trait HTMLFormElementHelpers { // https://html.spec.whatwg.org/multipage/forms.html#concept-form-submit - fn submit(self, from_submit_method: bool, submitter: FormSubmitter); + fn submit(self, submit_method_flag: SubmittedFrom, submitter: FormSubmitter); // https://html.spec.whatwg.org/multipage/forms.html#constructing-the-form-data-set fn get_form_dataset(self, submitter: Option<FormSubmitter>) -> Vec<FormDatum>; } impl<'a> HTMLFormElementHelpers for JSRef<'a, HTMLFormElement> { - fn submit(self, _from_submit_method: bool, submitter: FormSubmitter) { + fn submit(self, _submit_method_flag: SubmittedFrom, submitter: FormSubmitter) { // Step 1 let doc = document_from_node(self).root(); let win = window_from_node(self).root(); diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index cee45dcfa72..9b933c34dcc 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -19,7 +19,7 @@ use dom::element::{AttributeHandlers, Element, HTMLInputElementTypeId}; use dom::event::Event; use dom::eventtarget::{EventTarget, NodeTargetTypeId}; use dom::htmlelement::HTMLElement; -use dom::htmlformelement::{InputElement, FormOwner, HTMLFormElement, HTMLFormElementHelpers}; +use dom::htmlformelement::{InputElement, FormOwner, HTMLFormElement, HTMLFormElementHelpers, NotFromFormSubmitMethod}; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, document_from_node, window_from_node}; use dom::virtualmethods::VirtualMethods; @@ -397,7 +397,7 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLInputElement> { InputRadio => self.SetChecked(true), InputButton(Some(DEFAULT_SUBMIT_VALUE)) => { self.form_owner().map(|o| { - o.root().submit(false, InputElement(self.clone())) + o.root().submit(NotFromFormSubmitMethod, InputElement(self.clone())) }); } _ => {} |