diff options
author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.js | |
parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@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 | }, |