diff options
author | Jose Antonio Marquez | 2012-05-16 15:42:37 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-05-16 15:42:37 -0700 |
commit | 857aafee732b6a85fa155ff4a05d1b8fde48f09d (patch) | |
tree | e06d330caee280aa05aec46391979e9abdcf974c /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js | |
parent | 5cc5d29736d8bf253e3a168cdd6443e839ffb23c (diff) | |
parent | fd54dabad7cbc27a0efb0957155c00d578912909 (diff) | |
download | ninja-857aafee732b6a85fa155ff4a05d1b8fde48f09d.tar.gz |
Merge branch 'refs/heads/Ninja-DOM-Architecture' into Document
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.js | 4 |
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); |