integrating the latest montage version

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

3 files changed, 156 insertions, 111 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 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 @@
     <script type="text/montage-serialization">
         {
             "overlay": {
-                "module": "montage/ui/slot.reel",
-                "name": "Slot",
+                "prototype": "montage/ui/slot.reel",
                 "properties": {
                     "element": {"#": "editor-slot"},
                     "delegate": {"@": "owner"}
@@ -20,8 +19,7 @@
             },
 
             "owner": {
-                "module": "montage/ui/rich-text-editor/rich-text-editor.reel",
-                "name": "RichTextEditor",
+                "prototype": "montage/ui/rich-text-editor/rich-text-editor.reel",
                 "properties": {
                     "element": {"#": "rich-text-editor-container"},
                     "_overlaySlot": {"@": "overlay"}
@@ -32,9 +30,9 @@
 
 </head>
 <body>
-    <div id="rich-text-editor-container">
+    <div data-montage-id="rich-text-editor-container">
         <div class="montage-editor" contenteditable="false"></div>
-        <div id="editor-slot" class="montage-editor-overlay"></div>
+        <div data-montage-id="editor-slot" class="montage-editor-overlay"></div>
     </div>
 </body>
 </html>
diff --git a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
index 89af8eb3..a132b0ab 100644
--- a/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
+++ b/node_modules/montage/ui/rich-text-editor/rich-text-editor.reel/rich-text-editor.js
@@ -4,8 +4,11 @@
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
 /**
-        @module "montage/ui/rich-text-editor.reel"
+    @module "montage/ui/rich-text-editor/rich-text-editor.reel"
     @requires montage/core/core
+    @requires montage/core/event/mutable-event
+    @requires montage/core/event/event-manager
+    @requires rich-text-sanitizer
 */
 var Montage = require("montage").Montage,
     RichTextEditorBase = require("./rich-text-editor-base").RichTextEditorBase,
@@ -14,15 +17,38 @@ var Montage = require("montage").Montage,
     defaultEventManager = require("core/event/event-manager").defaultEventManager;
 
 /**
-    @class module:"montage/ui/rich-text-editor.reel".RichTextEditor
+    @classdesc The RichTextEditor component is a lightweight Montage component that provides basic HTML editing capability. It wraps the HTML5 <code>contentEditable</code> property and largely relies on the browser's support of <code><a href="http://www.quirksmode.org/dom/execCommand.html" target="_blank">execCommand</a></code>.
+    @class module:"montage/ui/rich-text-editor/rich-text-editor.reel".RichTextEditor
     @extends module:montage/ui/component.Component
+    @summary
+The easiest way to create a RichTextEditor is with a serialization and a &lt;div> tag:<p>