aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-31 12:20:03 -0700
committerPushkar Joshi2012-05-31 12:20:03 -0700
commit4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch)
treec5b17297aba04bd54a59cf6214d29486e089031b /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
parent75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff)
parent6042bdc5f2aada4412912fd01602d32c9088dc26 (diff)
downloadninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js')
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
index a132b0ab..13ba0518 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
@@ -318,7 +318,7 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo
318 318
319 if (slotElem) { 319 if (slotElem) {
320 if (slotElem.parentNode) { 320 if (slotElem.parentNode) {
321 slotElem.parentNode.removeChild(slotElem) 321 slotElem.parentNode.removeChild(slotElem);
322 } 322 }
323 this._activeOverlay = null; 323 this._activeOverlay = null;
324 slot.content = null; 324 slot.content = null;
@@ -643,7 +643,7 @@ exports.RichTextEditor = Montage.create(RichTextEditorBase,/** @lends module:"mo
643 value: function() { 643 value: function() {
644 var thisRef = this, 644 var thisRef = this,
645 prevValue; 645 prevValue;
646 updateValues = function() { 646 var updateValues = function() {
647 clearTimeout(thisRef._forceUpdateValuesTimeout); 647 clearTimeout(thisRef._forceUpdateValuesTimeout);
648 delete thisRef._forceUpdateValuesTimeout; 648 delete thisRef._forceUpdateValuesTimeout;
649 clearTimeout(thisRef._updateValuesTimeout); 649 clearTimeout(thisRef._updateValuesTimeout);