Don't pass nullable strings to native DOM methods that want non-nullable strings. Fixes #1207.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/components/script/dom/text.rs b/src/components/script/dom/text.rs
index b7b49ad3d3d..a0d866b21bd 100644
--- a/src/components/script/dom/text.rs
+++ b/src/components/script/dom/text.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use dom::bindings::codegen::TextBinding;
-use dom::bindings::utils::{DOMString, Fallible, null_str_as_empty};
+use dom::bindings::utils::{DOMString, Fallible};
 use dom::characterdata::CharacterData;
 use dom::document::AbstractDocument;
 use dom::node::{AbstractNode, ScriptView, Node, TextNodeTypeId};
@@ -26,15 +26,15 @@ impl Text {
         Node::reflect_node(@mut node, document, TextBinding::Wrap)
     }
 
-    pub fn Constructor(owner: @mut Window, text: &Option<DOMString>) -> Fallible<AbstractNode<ScriptView>> {
-        Ok(Text::new(null_str_as_empty(text), owner.Document()))
+    pub fn Constructor(owner: @mut Window, text: &DOMString) -> Fallible<AbstractNode<ScriptView>> {
+        Ok(Text::new(text.clone(), owner.Document()))
     }
 
     pub fn SplitText(&self, _offset: u32) -> Fallible<AbstractNode<ScriptView>> {
         fail!("unimplemented")
     }
 
-    pub fn GetWholeText(&self) -> Fallible<Option<DOMString>> {
-        Ok(None)
+    pub fn GetWholeText(&self) -> Fallible<DOMString> {
+        Ok(~"")
     }
 }