From 24b483db367291b72170f969de78efcb1a9b95bd Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 3 May 2012 22:53:07 -0700 Subject: integrating the latest montage version Signed-off-by: Valerio Virgillito --- .../rich-text-linkpopup.html | 10 +- .../rich-text-linkpopup.js | 1 + .../rich-text-resizer.reel/rich-text-resizer.css | 32 +-- .../rich-text-resizer.reel/rich-text-resizer.html | 26 ++- .../rich-text-resizer.reel/rich-text-resizer.js | 10 +- .../rich-text-editor.reel/rich-text-editor-base.js | 34 +--- .../rich-text-editor.reel/rich-text-editor.html | 10 +- .../rich-text-editor.reel/rich-text-editor.js | 223 ++++++++++++++------- 8 files changed, 195 insertions(+), 151 deletions(-) (limited to 'node_modules/montage/ui/rich-text-editor') diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html index 1e2ec2cc..04b52dd6 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.html @@ -11,16 +11,14 @@ -

- + diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js index 90342d81..02598030 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-linkpopup.reel/rich-text-linkpopup.js @@ -135,6 +135,7 @@ exports.RichTextLinkPopup = Montage.create(Component,/** @lends module:"montage/ if (this._editor.activeOverlay == this) { this._editor.hideOverlay(); } + this.target = null; return false; } diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css index 3147fc67..9f9affab 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.css @@ -30,94 +30,94 @@ border-radius: 5px; } -#montage-resizer-handle-n { +.montage-resizer-handle.n { top: -4px; left: 50%; margin-left: -4px; cursor: n-resize; } -#montage-resizer-handle-n:hover { +.montage-resizer-handle.n:hover { top: -5px; margin-left: -5px; } -#montage-resizer-handle-ne { +.montage-resizer-handle.ne { top: -4px; right: -4px; cursor: ne-resize; } -#montage-resizer-handle-ne:hover { +.montage-resizer-handle.ne:hover { top: -5px; right: -5px; } -#montage-resizer-handle-e { +.montage-resizer-handle.e { right: -4px; top: 50%; margin-top: -4px; cursor: e-resize; } -#montage-resizer-handle-e:hover { +.montage-resizer-handle.e:hover { right: -5px; margin-top: -5px; } -#montage-resizer-handle-se { +.montage-resizer-handle.se { bottom: -4px; right: -4px; cursor: se-resize; } -#montage-resizer-handle-se:hover { +.montage-resizer-handle.se:hover { bottom: -5px; right: -5px; } -#montage-resizer-handle-s { +.montage-resizer-handle.s { bottom: -4px; left: 50%; margin-left: -4px; cursor: s-resize; } -#montage-resizer-handle-s:hover { +.montage-resizer-handle.s:hover { bottom: -5px; margin-left: -5px; } -#montage-resizer-handle-sw { +.montage-resizer-handle.sw { bottom: -4px; left: -4px; cursor: sw-resize; } -#montage-resizer-handle-sw:hover { +.montage-resizer-handle.sw:hover { bottom: -5px; left: -5px; } -#montage-resizer-handle-w { +.montage-resizer-handle.w { left: -4px; top: 50%; margin-top: -4px; cursor: w-resize; } -#montage-resizer-handle-w:hover { +.montage-resizer-handle.w:hover { left: -5px; margin-top: -5px; } -#montage-resizer-handle-nw { +.montage-resizer-handle.nw { top: -4px; left: -4px; cursor: nw-resize; } -#montage-resizer-handle-nw:hover { +.montage-resizer-handle.nw:hover { top: -5px; left: -5px; } diff --git a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html index 56f6cf19..59121b61 100644 --- a/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html +++ b/node_modules/montage/ui/rich-text-editor/overlays/rich-text-resizer.reel/rich-text-resizer.html @@ -11,16 +11,14 @@ -

- -

+ +

\ No newline at end of file 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 */ editorSelectionDidChange: { value: function(range) { - if (this._ignoreNextSelectionchanged) { + if (this._ignoreNextSelectionchanged || this._finalizeDrag) { this._ignoreNextSelectionchanged = false; - } else if (this._editor.activeOverlay == this) { - this._editor.hideOverlay(); + } else { + if (this._editor.activeOverlay == this) { + this._editor.hideOverlay(); + } + this.target = null; } return false; @@ -338,7 +341,6 @@ exports.RichTextResizer = Montage.create(Component,/** @lends module:"montage/ui } this._finalizeDrag = false; - this._ignoreNextSelectionchanged = true; } } }, 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 e92da424..46e45926 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 @@ -907,10 +907,10 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage handleInput: { enumerable: false, value: function(event) { - if (!this._executingCommand && !this._nextInputIsNotTyping) { + if (!this._executingCommand && !this._ignoreNextInputEvent) { this._startTyping(); } - delete this._nextInputIsNotTyping; + delete this._ignoreNextInputEvent; if (this._hasSelectionChangeEvent === false) { this.handleSelectionchange(); @@ -1149,7 +1149,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage if (this.undoManager) { this.undoManager.add("Move", this._undo, this, "Move", this._innerElement); } - this._nextInputIsNotTyping = true; + this._ignoreNextInputEvent = true; this.handleDragend(event); this.handleSelectionchange(); @@ -1253,7 +1253,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage if (this.undoManager) { this.undoManager.add("Cut", this._undo, this, "Cut", this._innerElement); } - this._nextInputIsNotTyping = true; + this._ignoreNextInputEvent = true; } }, @@ -1389,34 +1389,10 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage doAction: { enumerable: true, value: function(action, value) { - var savedActiveElement = document.activeElement, - editorElement = this._innerElement; - - if (!editorElement) { - return; - } - - // Make sure we are the active element before calling execCommand - if (editorElement != savedActiveElement) { - editorElement.focus(); - } - - if (value === undefined) { - value = false; - } - this.execCommand(action, false, value); // Force an update states right away this._updateStates(); - - this.handleSelectionchange(); - this.markDirty(); - - // Reset the focus - if (editorElement != savedActiveElement) { - savedActiveElement.focus(); - } } }, @@ -1427,6 +1403,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage var editorElement = this._innerElement; if (!element || element === editorElement) { this._doingUndoRedo = true; + this._ignoreNextInputEvent = true; document.execCommand("undo", false, null); this.markDirty(); if (this.undoManager) { @@ -1447,6 +1424,7 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage var editorElement = this._innerElement; if (!element || element === editorElement) { this._doingUndoRedo = true; + this._ignoreNextInputEvent = true; document.execCommand("redo", false, null); this.markDirty(); if (this.undoManager) { diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html index 03724a92..cd180dcc 100644 --- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html +++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.html @@ -11,8 +11,7 @@