8 files changed, 20 insertions, 2582 deletions

diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js
index 72a6f034..c5729e98 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -296,14 +296,18 @@ exports.TextProperties = Montage.create(ToolProperties, {
 
     handleFontSelectionChange: {
         value: function(e) {
-            this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value);
             this.application.ninja.stage.textTool.element.focus();
+            this.application.ninja.stage.textTool.doAction("fontname", this.fontSelection.value);
+
+            //Note: Set Font Color on selection to ColorChip Component;
+            //this.this.application.ninja.stage.textTool.foreColor
+
         }
     },
 
     handleFontColorChange: {
         value: function(e) {
-            this.application.ninja.stage.textTool.element.style.color = e._event.color.css;
+            this.application.ninja.stage.textTool.foreColor = e._event.color.css;
             this.application.ninja.stage.textTool.element.focus();
             //this.application.ninja.stage.textTool.doAction("forecolor",e._event.color.css);
 
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 7f82855b..aa79b8bc 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,7 +6,6 @@ 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 = ("node_modules/labs/rich-text-editor.reel").RichTextEditor,
     ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.TextTool = Montage.create(DrawingTool, {
@@ -23,22 +22,30 @@ exports.TextTool = Montage.create(DrawingTool, {
             return this._selectedElement;
         },
         set: function(val) {
+            //Set Selected Element
             if (this._selectedElement !== null) {
-                this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
-                this.application.ninja.stage.textTool.value = "";
-                this.application.ninja.stage.textTool.element.style.display = "none";
-                ElementsMediator.setProperty(this.application.ninja.selectedElements, "color", [window.getComputedStyle(this.application.ninja.stage.textTool.element)["color"]], "Change", "textTool");
+                this.applyStyle();
             }
-            //Set Selected Element
             this._selectedElement = val;
-            if(val !== null) {
+            if(this._selectedElement !== null) {
                 this.drawTextTool();
                 this.handleScroll();
                 this.application.ninja.stage._iframeContainer.addEventListener("scroll", this, false);
             } else {
                 this.application.ninja.stage._iframeContainer.removeEventListener("scroll", this);
             }
+
+        }
+    },
+
+    applyStyle: {
+        value: function() {
+            this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
+            this.application.ninja.stage.textTool.value = "";
+            this.application.ninja.stage.textTool.element.style.display = "none";
+            //ElementsMediator.setProperty([this.selectedElement], "color", [window.getComputedStyle(this.application.ninja.stage.textTool.element)["color"]], "Change", "textTool");
         }
+
     },
 
     HandleLeftButtonDown: {
diff --git a/node_modules/labs/rich-text-editor.reel/rich-text-editor.css b/node_modules/labs/rich-text-editor.reel/rich-text-editor.css
deleted file mode 100644
index 656183c4..00000000
--- a/node_modules/labs/rich-text-editor.reel/rich-text-editor.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-
-.montage-editor {
-    /* need to be relative in order for the resizer to be positioned correctly */
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    right: 0;
-    padding: 4px;
-
-    font-size: 1.0em;
-    outline: none;
-    overflow: auto;
-    z-index: 1;
-}
-
-.montage-editor-frame {
-    position: relative;
-    overflow: auto;
-    height: 100%;
-    width: 100%;
-}
-
-.montage-resizer-element::selection {
-    background: rgba(0,0,0,0);
-}
-
-
-/*
-Resizer
-*/
-.montage-resizer {
-    display: inline-block;
-}
-
-.montage-resizer-frame {
-    position: absolute;
-    border: 1px solid black;
-    z-index: 30;
-}
-
-.montage-resizer-handle {
-    position: absolute;
-    border: 1px solid black;
-    background-color: white;
-    width: 6px;
-    height: 6px;
-    z-index: 31;
-}
-
-.montage-resizer.dragged .montage-resizer-handle{
-    display: none;
-}
-
-.montage-resizer-handle:hover {
-    background-color: black;
-}
-
-.montage-resizer-n {
-    cursor: n-resize;
-}
-.montage-resizer-ne {
-    cursor: ne-resize;
-}
-.montage-resizer-e {
-    cursor: e-resize;
-}
-.montage-resizer-se {
-    cursor: se-resize;
-}
-.montage-resizer-s {
-    cursor: s-resize;
-}
-.montage-resizer-sw {
-    cursor: sw-resize;
-}
-.montage-resizer-w {
-    cursor: w-resize;
-}
-.montage-resizer-nw {
-    cursor: nw-resize;
-}
-
-
-/*
-Link Popup
-*/
-.montage-link-popup {
-    -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.2);
-    -webkit-border-radius: 2px;
-    border-radius: 2px;
-    position: absolute;
-    border: 1px solid;
-    background-color: white;
-    color: #666;
-    padding: 12px 20px;
-    z-index: 50;
-    cursor: default;
-    border-color: #BBB #BBB #A8A8A8;
-    font: 13px/normal "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.montage-link-popup a {
-    cursor: pointer;
-    text-decoration: none;
-    color: #15C;
-}
\ No newline at end of file
diff --git a/node_modules/labs/rich-text-editor.reel/rich-text-editor.html b/node_modules/labs/rich-text-editor.reel/rich-text-editor.html
deleted file mode 100644
index 42425b40..00000000
--- a/node_modules/labs/rich-text-editor.reel/rich-text-editor.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<!-- <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> -->
-<html>
-<head>
-    <title></title>
-    <link rel="stylesheet" type="text/css" href="rich-text-editor.css">
-    <script type="text/montage-serialization">
-        {