aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-03 22:53:07 -0700
committerValerio Virgillito2012-05-03 22:53:07 -0700
commit24b483db367291b72170f969de78efcb1a9b95bd (patch)
treea691a7803cefbfa76a6331a50cbeebcd16287d91 /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
parentdc93269cfa7c315d22d85c8217e2412749643f28 (diff)
downloadninja-24b483db367291b72170f969de78efcb1a9b95bd.tar.gz
integrating the latest montage version
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js')
-rw-r--r--node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
index c8a00ef8..c9f94565 100644
--- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
+++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js
@@ -165,10 +165,13 @@ exports.RichTextResizer = Montage.create(Component,/** @lends module:"montage/ui
165 */ 165 */
166 editorSelectionDidChange: { 166 editorSelectionDidChange: {
167 value: function(range) { 167 value: function(range) {
168 if (this._ignoreNextSelectionchanged) { 168 if (this._ignoreNextSelectionchanged || this._finalizeDrag) {
169 this._ignoreNextSelectionchanged = false; 169 this._ignoreNextSelectionchanged = false;
170 } else if (this._editor.activeOverlay == this) { 170 } else {
171 this._editor.hideOverlay(); 171 if (this._editor.activeOverlay == this) {
172 this._editor.hideOverlay();
173 }
174 this.target = null;
172 } 175 }
173 176
174 return false; 177 return false;
@@ -338,7 +341,6 @@ exports.RichTextResizer = Montage.create(Component,/** @lends module:"montage/ui
338 } 341 }
339 342
340 this._finalizeDrag = false; 343 this._finalizeDrag = false;
341 this._ignoreNextSelectionchanged = true;
342 } 344 }
343 } 345 }
344 }, 346 },