diff options
| author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
| commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
| tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor-base.js | |
| parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
| parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
| download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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.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-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 | ||