aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 15:23:48 -0700
committerValerio Virgillito2012-05-16 15:23:48 -0700
commit13ae16997d4bbca14e255d5989d1c44a76eac72c (patch)
treed9ebb1dcc6bebee4cb910b950ecb67c1a2d593cd /node_modules/montage/ui/rich-text-editor
parent99f16ae08fbb0a6dfe6008c9833f2253b18c19e5 (diff)
downloadninja-13ae16997d4bbca14e255d5989d1c44a76eac72c.tar.gz
montage v.0.10 integration
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor')
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js4
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js4
2 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
index 46e45926..71169d00 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
@@ -569,7 +569,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
569 if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) { 569 if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) {
570 prevValue = this._textValue; 570 prevValue = this._textValue;
571 if (this.textValue !== prevValue) { 571 if (this.textValue !== prevValue) {
572 this.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(text.value)); 572 this.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(this.textValue));
573 } 573 }
574 } 574 }
575 } else if (this._textValue && !this._dirtyTextValue) { 575 } else if (this._textValue && !this._dirtyTextValue) {
@@ -608,7 +608,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
608 if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) { 608 if (defaultEventManager.registeredEventListenersForEventType_onTarget_("change@textValue", this)) {
609 prevValue = this._textValue; 609 prevValue = this._textValue;
610 if (this.textValue !== prevValue) { 610 if (this.textValue !== prevValue) {
611 this.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(text.value)); 611 this.dispatchEvent(MutableEvent.changeEventForKeyAndValue("textValue" , prevValue).withPlusValue(this.textValue));
612 } 612 }
613 } 613 }
614 614
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);