diff options
Diffstat (limited to 'components/script')
| -rwxr-xr-x | components/script/dom/htmltextareaelement.rs | 16 | ||||
| -rw-r--r-- | components/script/dom/node.rs | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 7996eecc563..af69e227d60 100755 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -50,7 +50,7 @@ pub struct HTMLTextAreaElement { pub trait LayoutHTMLTextAreaElementHelpers { #[allow(unsafe_code)] - unsafe fn get_value_for_layout(self) -> String; + unsafe fn value_for_layout(self) -> String; #[allow(unsafe_code)] unsafe fn selection_for_layout(self) -> Option<Range<usize>>; #[allow(unsafe_code)] @@ -62,13 +62,16 @@ pub trait LayoutHTMLTextAreaElementHelpers { impl LayoutHTMLTextAreaElementHelpers for LayoutDom<HTMLTextAreaElement> { #[allow(unrooted_must_root)] #[allow(unsafe_code)] - unsafe fn get_value_for_layout(self) -> String { + unsafe fn value_for_layout(self) -> String { let text = (*self.unsafe_get()).textinput.borrow_for_layout().get_content(); - String::from(if text.is_empty() { - (*self.unsafe_get()).placeholder.borrow_for_layout().clone() + if text.is_empty() { + (*self.unsafe_get()).placeholder + .borrow_for_layout() + .replace("\r\n", "\n") + .replace("\r", "\n") } else { - text - }) + text.into() + } } #[allow(unrooted_must_root)] @@ -138,7 +141,6 @@ impl HTMLTextAreaElement { let has_value = !self.textinput.borrow().is_empty(); let el = self.upcast::<Element>(); el.set_placeholder_shown_state(has_placeholder && !has_value); - el.set_placeholder_shown_state(has_placeholder); } } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 91df38cf1f6..68e6f63e168 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -1140,7 +1140,7 @@ impl LayoutNodeHelpers for LayoutDom<Node> { } if let Some(area) = self.downcast::<HTMLTextAreaElement>() { - return unsafe { area.get_value_for_layout() }; + return unsafe { area.value_for_layout() }; } panic!("not text!") |