From bfd796e47c856c6620dc4b32ac6c710d4a493d3a Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Tue, 27 Mar 2012 15:24:30 -0700
Subject: Text Tool - Remove inline style from user document

---
 js/tools/TextTool.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/tools/TextTool.js')

diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 4c464173..d27a32bb 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool;
-    RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor;
+    RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor,
+    ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.TextTool = Montage.create(DrawingTool, {
 
@@ -21,7 +22,7 @@ exports.TextTool = Montage.create(DrawingTool, {
                 this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
                 this.application.ninja.stage.textTool.value = "";
                 this.application.ninja.stage.textTool.element.style.display = "none";
-                this.applyElementStyles(this.application.ninja.stage.textTool.element.firstChild, this.selectedElement, ["color"]);
+                ElementsMediator.setProperty(this.application.ninja.selectedElements, "color", [window.getComputedStyle(this.application.ninja.stage.textTool.element.firstChild)["color"]], "Change", "textTool");
             }
             //Set Selected Element
             this._selectedElement = val;
-- 
cgit v1.2.3


From a11ef2eed7049835c8bdfa50a2b893632c46eaa0 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Wed, 4 Apr 2012 11:11:58 -0700
Subject: Squashed commit of Preparing for the montage undo-manager:
 Architecture changes

Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/tools/TextTool.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'js/tools/TextTool.js')

diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index d27a32bb..a58aacc6 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -95,7 +95,7 @@ exports.TextTool = Montage.create(DrawingTool, {
             } else {
                 this.doSelection(event);
                 if (this.application.ninja.selectedElements.length !== 0 ) {
-                    this.selectedElement = this.application.ninja.selectedElements[0]._element;
+                    this.selectedElement = this.application.ninja.selectedElements[0];
                 }
                 this._isDrawing = false;
             }
@@ -144,7 +144,7 @@ exports.TextTool = Montage.create(DrawingTool, {
 
     HandleDoubleClick: {
         value: function(e) {
-            //this.application.ninja.selectedElements[0]._element.setAttribute("contenteditable", true);
+            //this.application.ninja.selectedElements[0].setAttribute("contenteditable", true);
 
             //if (!this.application.ninja.textTool) {
 
-- 
cgit v1.2.3