1 files changed, 120 insertions, 81 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 0bdf67e7..9791908f 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
@@ -9,13 +9,31 @@
 */
 var Montage = require("montage").Montage,
     Component = require("ui/component").Component,
-    MutableEvent = require("core/event/mutable-event").MutableEvent,
     Sanitizer = require("./rich-text-sanitizer").Sanitizer,
     RichTextLinkPopup = require("../overlays/rich-text-linkpopup.reel").RichTextLinkPopup,
     RichTextResizer = require("../overlays/rich-text-resizer.reel").RichTextResizer,
-    defaultEventManager = require("core/event/event-manager").defaultEventManager,
+    ChangeNotification = require("core/change-notification").ChangeNotification,
     defaultUndoManager = require("core/undo-manager").defaultUndoManager;
 
+
+/** static variables, constants
+ */
+var COMMANDS = [
+        {property: "bold"},
+        {property: "underline"},
+        {property: "italic"},
+        {property: "strikeThrough"},
+        {property: "baselineShift", method: this._baselineShiftGetState},
+        {property: "justify", method: this._justifyGetState},
+        {property: "listStyle", method: this._listStyleGetState},
+        {property: "fontName", method: this._fontNameGetState},
+        {property: "fontSize"},
+        {property: "backColor"},
+        {property: "foreColor"}
+    ],
+    NBR_COMMANDS = COMMANDS.length;
+
+
 /**
     @class module:"montage/ui/rich-text-editor.reel".RichTextEditorBase
     @extends module:montage/ui/component.Component
@@ -254,9 +272,17 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
     // Commands Helpers
     _getState: {
         value: function(property, command) {
-            var state;
+            var state,
+                savedActiveElement = document.activeElement,
+                editorElement = this._innerElement;
+
+            if (editorElement && !this["_" + property + "_locked"]) {
+
+                // Make sure we are the active element before calling execCommand
+                if (editorElement && editorElement != savedActiveElement) {
+                    editorElement.focus();
+                }
 
-            if (this._innerElement == document.activeElement) {
                 state = document.queryCommandValue(command);
                 // Convert string to boolean
                 if (state == "true") {
@@ -264,9 +290,15 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
                 } if (state == "false") {
                     state = false;
                 }
+
+                // Reset the focus
+                if (editorElement && editorElement != savedActiveElement) {
+                    savedActiveElement.focus();
+                }
+
                 return state;
             } else {
-                return this["_" + property];
+               return this["_" + property];
             }
         }
     },
@@ -320,7 +352,15 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
     _baselineShiftGetState: {
         enumerable: false,
         value: function() {
-            if (this._innerElement == document.activeElement) {
+            var savedActiveElement = document.activeElement,
+            editorElement = this._innerElement;
+
+            if (editorElement && !this._baselineShift_locked) {
+                 // Make sure we are the active element before calling execCommand
+                if (editorElement != savedActiveElement) {
+                    editorElement.focus();
+                }
+
                 if (this._getState("baselineShift", "subscript")) {
                    return "subscript"
                 } else if (this._getState("baselineShift", "superscript")) {
@@ -328,6 +368,11 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
                 } else {
                     return "baseline";     // default
                 }
+
+                 // Reset the focus
+                if (editorElement != savedActiveElement) {
+                    savedActiveElement.focus();
+                }
             } else {
                 return this._baselineShift;
             }
@@ -347,7 +392,15 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
     _listStyleGetState: {
         enumerable: false,
         value: function() {
-            if (this._innerElement == document.activeElement) {
+            var savedActiveElement = document.activeElement,
+            editorElement = this._innerElement;
+
+            if (editorElement && !this._listStyle_locked) {
+                // Make sure we are the active element before calling execCommand
+                if (editorElement != savedActiveElement) {
+                    editorElement.focus();
+                }
+
                 if (this._getState("listStyle", "insertorderedlist")) {
                    return "ordered"
                 } else if (this._getState("listStyle", "insertunorderedlist")) {
@@ -355,6 +408,11 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
                 } else {
                     return "none";     // default
                 }
+
+                 // Reset the focus
+                if (editorElement != savedActiveElement) {
+                    savedActiveElement.focus();
+                }
             } else {
                 return this._listStyle;
             }
@@ -373,7 +431,15 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
     _justifyGetState: {
         enumerable: false,
         value: function() {
-            if (this._innerElement == document.activeElement) {
+            var savedActiveElement = document.activeElement,
+            editorElement = this._innerElement;
+
+            if (editorElement && !this._justify_locked) {
+                // Make sure we are the active element before calling execCommand
+                if (editorElement != savedActiveElement) {
+                    editorElement.focus();
+                }
+
                 if (this._getState("justify", "justifyleft")) {
                    return "left"
                 } else if (this._getState("justify", "justifycenter")) {
@@ -385,6 +451,11 @@ exports.RichTextEditorBase = Montage.create(Component,/** @lends module:"montage
                 } else {
                     return "left";     // default
                 }
+
+                // Reset the focus
+                if (editorElement != savedActiveElement) {
+                    savedActiveElement.focus();
+                }