mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Extract common text control selection code
The API for text control selection is the same for both <input> and <textarea>: https://html.spec.whatwg.org/multipage/form-control-infrastructure.html#textFieldSelection Before this change, they had similar but not identical implementations with duplicate code. Now there is a common TextControl trait which contains the implementation used by both. As a result, some previously failing tests now pass.
This commit is contained in:
parent
f290cacccd
commit
6beda3c761
5 changed files with 124 additions and 97 deletions
|
@ -23,6 +23,7 @@ use dom::keyboardevent::KeyboardEvent;
|
|||
use dom::node::{ChildrenMutation, Node, NodeDamage, UnbindContext};
|
||||
use dom::node::{document_from_node, window_from_node};
|
||||
use dom::nodelist::NodeList;
|
||||
use dom::textcontrol::TextControl;
|
||||
use dom::validation::Validatable;
|
||||
use dom::virtualmethods::VirtualMethods;
|
||||
use dom_struct::dom_struct;
|
||||
|
@ -140,6 +141,12 @@ impl HTMLTextAreaElement {
|
|||
}
|
||||
}
|
||||
|
||||
impl TextControl for HTMLTextAreaElement {
|
||||
fn textinput(&self) -> &DomRefCell<TextInput<ScriptToConstellationChan>> {
|
||||
&self.textinput
|
||||
}
|
||||
}
|
||||
|
||||
impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
|
||||
// TODO A few of these attributes have default values and additional
|
||||
// constraints
|
||||
|
@ -237,53 +244,39 @@ impl HTMLTextAreaElementMethods for HTMLTextAreaElement {
|
|||
self.upcast::<HTMLElement>().labels()
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectiondirection
|
||||
fn SetSelectionDirection(&self, direction: DOMString) {
|
||||
self.textinput.borrow_mut().selection_direction = SelectionDirection::from(direction);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectiondirection
|
||||
fn SelectionDirection(&self) -> DOMString {
|
||||
DOMString::from(self.textinput.borrow().selection_direction)
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionend
|
||||
fn SetSelectionEnd(&self, end: u32) {
|
||||
let selection_start = self.SelectionStart();
|
||||
self.textinput.borrow_mut().set_selection_range(selection_start, end);
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionend
|
||||
fn SelectionEnd(&self) -> u32 {
|
||||
self.textinput.borrow().get_absolute_insertion_point() as u32
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionstart
|
||||
fn SelectionStart(&self) -> u32 {
|
||||
self.dom_selection_start()
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionstart
|
||||
fn SetSelectionStart(&self, start: u32) {
|
||||
let selection_end = self.SelectionEnd();
|
||||
self.textinput.borrow_mut().set_selection_range(start, selection_end);
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
self.set_dom_selection_start(start);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionstart
|
||||
fn SelectionStart(&self) -> u32 {
|
||||
self.textinput.borrow().get_selection_start()
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionend
|
||||
fn SelectionEnd(&self) -> u32 {
|
||||
self.dom_selection_end()
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectionend
|
||||
fn SetSelectionEnd(&self, end: u32) {
|
||||
self.set_dom_selection_end(end);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectiondirection
|
||||
fn SelectionDirection(&self) -> DOMString {
|
||||
self.dom_selection_direction()
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-selectiondirection
|
||||
fn SetSelectionDirection(&self, direction: DOMString) {
|
||||
self.set_dom_selection_direction(direction);
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-textarea/input-setselectionrange
|
||||
fn SetSelectionRange(&self, start: u32, end: u32, direction: Option<DOMString>) {
|
||||
let direction = direction.map_or(SelectionDirection::None, |d| SelectionDirection::from(d));
|
||||
self.textinput.borrow_mut().selection_direction = direction;
|
||||
self.textinput.borrow_mut().set_selection_range(start, end);
|
||||
let window = window_from_node(self);
|
||||
let _ = window.user_interaction_task_source().queue_event(
|
||||
&self.upcast(),
|
||||
atom!("select"),
|
||||
EventBubbles::Bubbles,
|
||||
EventCancelable::NotCancelable,
|
||||
&window);
|
||||
self.upcast::<Node>().dirty(NodeDamage::OtherNodeDamage);
|
||||
self.set_dom_selection_range(start, end, direction);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue