mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Correct default Selectionstart and SelectionEnd
This commit is contained in:
parent
e19bab84cf
commit
b2c1f89b93
8 changed files with 144 additions and 87 deletions
|
@ -233,7 +233,7 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
|
|||
// if the element's dirty value flag is false, then the element's
|
||||
// raw value must be set to the value of the element's textContent IDL attribute
|
||||
if !self.value_dirty.get() {
|
||||
self.reset();
|
||||
self.reset(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -244,26 +244,7 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
|
|||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea-value
|
||||
fn SetValue(&self, value: DOMString) {
|
||||
let mut textinput = self.textinput.borrow_mut();
|
||||
|
||||
// Step 1
|
||||
let old_value = textinput.get_content();
|
||||
let old_selection = textinput.selection_origin;
|
||||
|
||||
// Step 2
|
||||
textinput.set_content(value);
|
||||
|
||||
// Step 3
|
||||
self.value_dirty.set(true);
|
||||
|
||||
if old_value != textinput.get_content() {
|
||||
// Step 4
|
||||
textinput.clear_selection_to_limit(Direction::Forward);
|
||||
} else {
|
||||
textinput.selection_origin = old_selection;
|
||||
}
|
||||
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
self.update_text_contents(value, true);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-lfe-labels
|
||||
|
@ -325,9 +306,9 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
|
|||
|
||||
|
||||
impl HTMLTextAreaElement {
|
||||
pub fn reset(&self) {
|
||||
pub fn reset(&self, update_text_cursor: bool) {
|
||||
// https://html.spec.whatwg.org/multipage/#the-textarea-element:concept-form-reset-control
|
||||
self.SetValue(self.DefaultValue());
|
||||
self.update_text_contents(self.DefaultValue(), update_text_cursor);
|
||||
self.value_dirty.set(false);
|
||||
}
|
||||
|
||||
|
@ -335,6 +316,30 @@ impl HTMLTextAreaElement {
|
|||
fn selection(&self) -> TextControlSelection<Self> {
|
||||
TextControlSelection::new(&self, &self.textinput)
|
||||
}
|
||||
|
||||
// Helper function to check if text_cursor is to be updated or not
|
||||
fn update_text_contents(&self, value: DOMString, update_text_cursor: bool) {
|
||||
let mut textinput = self.textinput.borrow_mut();
|
||||
|
||||
// Step 1
|
||||
let old_value = textinput.get_content();
|
||||
let old_selection = textinput.selection_origin;
|
||||
|
||||
// Step 2
|
||||
textinput.set_content(value, update_text_cursor);
|
||||
|
||||
// Step 3
|
||||
self.value_dirty.set(true);
|
||||
|
||||
if old_value != textinput.get_content() {
|
||||
// Step 4
|
||||
textinput.clear_selection_to_limit(Direction::Forward, update_text_cursor);
|
||||
} else {
|
||||
textinput.selection_origin = old_selection;
|
||||
}
|
||||
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -427,7 +432,7 @@ impl VirtualMethods for HTMLTextAreaElement {
|
|||
s.children_changed(mutation);
|
||||
}
|
||||
if !self.value_dirty.get() {
|
||||
self.reset();
|
||||
self.reset(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -478,7 +483,7 @@ impl VirtualMethods for HTMLTextAreaElement {
|
|||
self.super_type().unwrap().pop();
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#the-textarea-element:stack-of-open-elements
|
||||
self.reset();
|
||||
self.reset(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue