Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

delete suffixes

Browse source 
delete suffixes for variants SubmittedFrom, ResetFrom

delete suffixes

for variants SubmittedFrom, ResetFrom
This commit is contained in:
Rafael Quintero 2016-06-04 00:42:16 -04:00
parent 93fc7c9cc3
commit 80aad09ae4
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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);
}
}
_ => (),

16
components/script/dom/htmlformelement.rs
View file

@ -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,

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

@ -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()));
}
}