aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
diff options
context:
space:
mode:
authorEric Guzman2012-05-17 17:43:05 -0700
committerEric Guzman2012-05-17 17:43:05 -0700
commit458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch)
treeee329e409fe28ae54c894b9e27e82e1f85aefc85 /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js
parent82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff)
parent52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff)
downloadninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts: js/document/templates/montage-html/default_html.css js/lib/NJUtils.js
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js')
-rw-r--r--node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.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-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