aboutsummaryrefslogtreecommitdiff
path: root/js/components/hintable.reel/hintable.js
diff options
context:
space:
mode:
authorKruti Shah2012-05-31 10:44:45 -0700
committerKruti Shah2012-05-31 10:44:45 -0700
commitc350cc1c060fdf17357ddadce024267943784593 (patch)
tree453f86e88f1ee1dfda6fb4b7cc7b17e306e39536 /js/components/hintable.reel/hintable.js
parentfdc4f5c7f81ae3b9adeca2232e60268b4be594a2 (diff)
parent121d0e616f48aa7cd048763554089c20a1883d7a (diff)
downloadninja-c350cc1c060fdf17357ddadce024267943784593.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/hintable.reel/hintable.js')
-rw-r--r--js/components/hintable.reel/hintable.js50
1 files changed, 7 insertions, 43 deletions
diff --git a/js/components/hintable.reel/hintable.js b/js/components/hintable.reel/hintable.js
index 6e3b2aaf..08e87bf0 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
@@ -327,48 +331,8 @@ exports.Hintable = Montage.create(Editable, {
327 revert : [27], 331 revert : [27],
328 backsp : [8] 332 backsp : [8]
329 } 333 }
330 } 334 },
335 distinct: true
331 } 336 }
332 337
333}); 338});
334
335// suggest : {
336// value : function(hint) {
337// ///// if no hint argument passed, clear suggestions
338// if(!hint) {
339// this.clearHint();
340// return false;
341// }
342//
343// this._hint = hint;
344//
345// ///// append span with suggested hint
346// if(this.hintElement) {
347// this.clearHint();
348//
349// ///// Set the hint element's text
350// this._getFirstTextNode(this.hintElement).textContent = hint;
351//
352// ///// if hintElement was removed from the DOM, the object still
353// ///// exists, so it needs to be re-appended
354// if(this.hintElement.parentNode === null) {
355// this._element.appendChild(this.hintElement);
356// }
357// } else {
358// /// Remove the phantom "<BR>" element that is generated when
359// /// content editable element is empty
360// this._children(this._element, function(item) {
361// return item.nodeName === 'BR';
362// }).forEach(function(item) {
363// this._element.removeChild(item);
364// }, this);
365//
366// this.hintElement = document.createElement('span');
367// this.hintElement.classList.add(this.suggestClass);
368// this.hintElement.appendChild(document.createTextNode(hint));
369// this._element.appendChild(this.hintElement);
370// }
371//
372// this._hint = hint;
373// }
374// }, \ No newline at end of file