address contentEditable warnings

urbit · Aug 25, 2015 · 437e416 · 437e416
1 parent 1680383
commit 437e416
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/urb/zod/pub/work/src/js/components/ItemComponent.coffee b/urb/zod/pub/work/src/js/components/ItemComponent.coffee
@@ -30,7 +30,9 @@ Field = recl
       if elem is 'textarea' then (textarea props)
       else
         props.contentEditable = true
-        (rece elem, props, props.defaultValue)
+        props.dangerouslySetInnerHTML = 
+          __html: $('<div>').text(props.defaultValue).html()
+        (rece elem, props)
 
   onKeyUp: (e) ->
     $t = $(e.target).closest '.field'

diff --git a/urb/zod/pub/work/src/js/components/ListComponent.coffee b/urb/zod/pub/work/src/js/components/ListComponent.coffee
@@ -113,7 +113,6 @@ module.exports = recl
         $title.focus()
       if @state.select is "end"
         r = window.getSelection().getRangeAt(0)
-        console.log @state.selected,$title
         r.setStart $title[0],0
         r.setEnd $title[0],0
         s = window.getSelection()

diff --git a/urb/zod/pub/work/src/js/main.js b/urb/zod/pub/work/src/js/main.js
@@ -328,7 +328,9 @@ Field = recl({
     });
     return div({
       className: className
-    }, elem === 'textarea' ? textarea(props) : (props.contentEditable = true, rece(elem, props, props.defaultValue)));
+    }, elem === 'textarea' ? textarea(props) : (props.contentEditable = true, props.dangerouslySetInnerHTML = {
+      __html: $('<div>').text(props.defaultValue).html()
+    }, rece(elem, props)));
   },
   onKeyUp: function(e) {
     var $t, val;
@@ -827,7 +829,6 @@ module.exports = recl({
       }
       if (this.state.select === "end") {
         r = window.getSelection().getRangeAt(0);
-        console.log(this.state.selected, $title);
         r.setStart($title[0], 0);
         r.setEnd($title[0], 0);
         s = window.getSelection();