diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@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.js | 10 |
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 | }, |