From 5f506542d28e12b707c3bfa41b53383519838477 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Tue, 7 Feb 2012 16:50:27 -0800
Subject: Revert "Initial Text Tool Implementation"

This reverts commit 2082fa6912eec2ffabd2081b7706e8e1b88a9711.
---
 js/stage/stage.reel/stage.html | 12 +-----------
 js/stage/stage.reel/stage.js   |  7 -------
 2 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'js/stage')

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)
-- 
cgit v1.2.3


From f979f47658a03640cc81e729e3cf88d80f8ec366 Mon Sep 17 00:00:00 2001
From: Armen Kesablyan
Date: Mon, 13 Feb 2012 13:44:37 -0800
Subject: appended function : toViewportCoordinates in stage

Signed-off-by: Armen Kesablyan <armen@motorola.com>
---
 js/stage/stage.reel/stage.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'js/stage')

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 9e2df5a2..77cd1936 100644
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -780,6 +780,12 @@ exports.Stage = Montage.create(Component, {
         }
     },
 
+    toViewportCoordinates: {
+        value: function(x,y) {
+            return [x + this._userContentLeft, y + this._userContentTop];
+        }
+    },
+
     setZoom: {
         value: function(value) {
             if(!this._firstDraw)
-- 
cgit v1.2.3