4 files changed, 10 insertions, 111 deletions

diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index cf8880a3..94860b30 100644
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, {
     init : {
         enumerable:true,
         value : function (){
-            this.minHeight = 195;
-            this.contentHeight = 195;
-            this.defaultHeight= 195;
+            this.minHeight = 300;
+            this.contentHeight = 300;
+            this.defaultHeight= 300;
 
             /* OLD WAY -- Removing the temporary div
             // TODO: Remove this comment once this is tested.
diff --git a/js/stage/stage.reel/stage.html b/js/stage/stage.reel/stage.html
index 07b823a7..49d10baf 100644
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -34,14 +34,6 @@
                     }
                 }
             },
-
-            "textTool": {
-                "module": "montage/ui/rich-text-editor.reel",
-                "name": "RichTextEditor",
-                "properties": {
-                    "element" : {"#": "textToolObject"}
-                }
-            },
             
             "owner": {
                 "module": "js/stage/stage.reel",
@@ -54,8 +46,7 @@
                     "_canvas":  {"#": "stageCanvas"},
                     "_drawingCanvas":  {"#": "drawingCanvas"},
                     "stageDeps": {"@": "StageDeps1"},
-                    "layout":   {"@": "layout1"},
-                    "textTool": {"@": "textTool"}
+                    "layout":   {"@": "layout1"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
@@ -73,7 +64,6 @@
 
     <section id="stageAndScenesContainer" class="stageAndScenesContainer">
         <section id="iframeContainer"></section>
-        <section id="textToolObject">asdasd asd asd asd asd asd </section>
         <section id="codeViewContainer"></section>
         <canvas id="layoutCanvas"></canvas>
         <canvas id="stageCanvas"></canvas>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 96bfccdd..3e0b852e 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -12,7 +12,6 @@ var vecUtils = require("js/helper-classes/3D/vec-utils").VecUtils;
 
 exports.Stage = Montage.create(Component, {
 
-    textTool: { value: null },
     // TODO - Need to figure out how to remove this dependency
     // Needed by some tools that depend on selectionDrawn event to set up some logic
     drawNow: { value : false },
@@ -781,12 +780,6 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
-    toViewportCoordinates: {
-        value: function(x,y) {
-            return [x + this._userContentLeft, y + this._userContentTop];
-        }
-    },
-
     setZoom: {
         value: function(value) {
             if(!this._firstDraw)
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 8b48ff4f..538583ee 100644
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,30 +6,12 @@ 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("montage/ui/rich-text-editor.reel").RichTextEditor;
 
 exports.TextTool = Montage.create(DrawingTool, {
-
-    _selectedElement: { value : null },
-
-    selectedElement: {
-        get: function() {
-            return this._selectedElement;
-        },
-        set: function(val) {
-            if(this._selectedElement !== null) {
-                
-            }
-            this._selectedElement = val;
-        }
-    },
-    
-
     drawingFeedback: { value: { mode: "Draw3D", type: "rectangle" } },
 
     HandleLeftButtonDown: {
         value: function(event) {
-            this.deselectText();
             this.startDraw(event);
         }
     },
@@ -68,88 +50,24 @@ exports.TextTool = Montage.create(DrawingTool, {
                 if(drawData) {
                     //this.insertElement(drawData);
                 }
-                
+
                 this._hasDraw = false;
                 this.endDraw(event);
             } else {
+
                 this.doSelection(event);
-                console.log("im here");
-                if (this.application.ninja.selectedElements.length !== 0 ) {
-                    this.selectedElement = this.application.ninja.selectedElements[0]._element;
-                    this.drawTextTool();
-                }
 
                 this._isDrawing = false;
             }
         }
     },
 
-    applyElementStyles : {
-        value: function(fromElement, toElement, styles) {
-            styles.forEach(function(style) {
-                var styleCamelCase = style.replace(/(\-[a-z])/g, function($1){return $1.toUpperCase().replace('-','');});
-                console.log(styleCamelCase, style, window.getComputedStyle(fromElement)[style]);
-                toElement.style[styleCamelCase] = window.getComputedStyle(fromElement)[style];
-            }, this);
-        }
-    },
-
-    drawTextTool: {
-        value: function() {
-            console.log(" now im here");
-            this.application.ninja.stage.textTool.value = this.selectedElement.innerHTML;
-            if(this.application.ninja.stage.textTool.value === "") { this.application.ninja.stage.textTool.value = " "; }
-            this.selectedElement.innerHTML = "";
-
-            //Styling Options for text tool to look identical to the text you are manipulating.
-            this.application.ninja.stage.textTool.element.style.display = "block";
-            this.application.ninja.stage.textTool.element.style.position = "absolute";
-
-            // Set Top & Left Positions
-            var textToolCoordinates = this.application.ninja.stage.toViewportCoordinates(this.selectedElement.offsetLeft, this.selectedElement.offsetTop);
-            this.application.ninja.stage.textTool.element.style.left = textToolCoordinates[0] + "px";
-            this.application.ninja.stage.textTool.element.style.top = textToolCoordinates[1] + "px";
-
-            // Set Width, Height
-            this.application.ninja.stage.textTool.element.style.width = this.selectedElement.offsetWidth + "px";
-            this.application.ninja.stage.textTool.element.style.height = this.selectedElement.offsetHeight + "px";
-
-
-            // Set font styling (Size, Style, Weight)
-
-            me = this;
-            this.application.ninja.stage.textTool.didDraw = function() {
-                me.applyElementStyles(me.selectedElement, me.application.ninja.stage.textTool.element, ["overflow"]);
-                me.applyElementStyles(me.selectedElement, me.application.ninja.stage.textTool.element.firstChild, ["font","padding-left","padding-top","padding-right","padding-bottom", "color"]);
-                var range = document.createRange(),
-                sel   = window.getSelection();
-                sel.removeAllRanges();
-                range.selectNodeContents(this.application.ninja.stage.textTool.element.firstChild);
-                sel.addRange(range);
-                this.didDraw = function() {};
-                console.log("im drew here");
-            }
-            console.log("i end here");
-        }
-    },
-
-
-    deselectText: {
-        value: function() {
-            this.application.ninja.stage.textTool.element.style.display = "none";
-            this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
-            this.application.ninja.stage.textTool.value = "";
-        }
-    },
-
     HandleDoubleClick: {
         value: function(e) {
-            //this.application.ninja.selectedElements[0]._element.setAttribute("contenteditable", true);
-
-            //if (!this.application.ninja.textTool) {
-
-            //}
-
+            console.log(this.application.ninja.selectedElements[0]._element);
+            this.application.ninja.selectedElements[0]._element.setAttribute("contenteditable", true);
+            this.application.ninja.stage._iframeContainer.style.zIndex = 200;
+            this.application.ninja.selectedElements[0]._element.focus();
 
 
         }
@@ -157,12 +75,10 @@ exports.TextTool = Montage.create(DrawingTool, {
 
     Configure: {
         value: function(wasSelected) {
-            
             if(wasSelected) {
                 NJevent("enableStageMove");
                 this.application.ninja.stage.stageDeps.snapManager.setupDragPlaneFromPlane( workingPlane );
             } else {
-                this.deselectText();