aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJonathan Duran2012-05-25 14:09:33 -0700
committerJonathan Duran2012-05-25 14:09:33 -0700
commit5743d386408da3810c25e4a34e6829cac47cab06 (patch)
tree44dc57c22a29d266f491c13c1b5c8d9c55b02182 /js/components
parent6808427d3c0defa9f00884711b316f4e76ac54fc (diff)
parentb0a736deb4f3bb515e0ca4009fe4f98e22cec2c0 (diff)
downloadninja-5743d386408da3810c25e4a34e6829cac47cab06.tar.gz
Merge branch 'refs/heads/timeline-local' into TimelineUber
Diffstat (limited to 'js/components')
-rw-r--r--js/components/hintable.reel/hintable.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 6e3b2aaf..015b3a30 100644
--- a/js/components/hintable.reel/hintable.js
+++ b/js/components/hintable.reel/hintable.js
@@ -146,7 +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.textContent = str;
151 }
152
153 //node.innerText = str;
150 } 154 }
151 }, 155 },
152 156