aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJon Reid2012-05-24 17:46:47 -0700
committerJon Reid2012-05-24 17:46:47 -0700
commit811ce7a7cdec18f304c6660a70012960e61d967a (patch)
treece329eb8d190639a8a8e25f5f29cf95faf1b7eba /js/components
parent1f00ec0f35c798556ae1f8b6e0e9eb57f43b5df0 (diff)
downloadninja-811ce7a7cdec18f304c6660a70012960e61d967a.tar.gz
Timeline: bug fix "Layer name gets doubled" (Spreadsheet)
Diffstat (limited to 'js/components')
-rw-r--r--js/components/editable.reel/editable.js3
-rw-r--r--js/components/hintable.reel/hintable.js7
2 files changed, 6 insertions, 4 deletions
diff --git a/js/components/editable.reel/editable.js b/js/components/editable.reel/editable.js
index 6ccb0445..dad93b31 100644
--- a/js/components/editable.reel/editable.js
+++ b/js/components/editable.reel/editable.js
@@ -96,8 +96,7 @@ exports.Editable = Montage.create(Component, {
96 return this._element.textContent; 96 return this._element.textContent;
97 }, 97 },
98 set: function(str) { 98 set: function(str) {
99 //this._element.textContent = str; 99 this._element.textContent = str;
100 this._element.innerText = str;
101 } 100 }
102 }, 101 },
103 102
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 79549191..015b3a30 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -146,8 +146,11 @@ exports.Hintable = Montage.create(Editable, {
146 }, 146 },
147 set: function(str) { 147 set: function(str) {
148 var node = this._getFirstTextNode(); 148 var node = this._getFirstTextNode();
149 //node.textContent = str; 149 if (node.textContent !== str) {
150 node.innerText = str; 150 node.textContent = str;
151 }
152
153 //node.innerText = str;
151 } 154 }
152 }, 155 },
153 156