From f3dc624fa464a79fd8e8cec1ddd16ed2109bda23 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:05:27 -0800
Subject: Revert "Merge from /joseeight/ninja-internal/tree/FileIO"

This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07.

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 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 9ed0f636..f28d9800 100755
--- a/js/stage/stage.reel/stage.html
+++ b/js/stage/stage.reel/stage.html
@@ -42,14 +42,6 @@
                     }
                 }
             },
-
-            "textTool": {
-                "module": "node_modules/labs/rich-text-editor.reel",
-                "name": "RichTextEditor",
-                "properties": {
-                    "element" : {"#": "textToolObject"}
-                }
-            },
             
             "owner": {
                 "module": "js/stage/stage.reel",
@@ -62,8 +54,7 @@
                     "_drawingCanvas":  {"#": "drawingCanvas"},
                     "stageDeps": {"@": "StageDeps1"},
                     "layout":   {"@": "layout1"},
-					"stageView": {"@": "stageView"},
-                    "textTool": {"@": "textTool"}
+					"stageView": {"@": "stageView"}
                 },
                 "bindings": {
                     "currentDocumentStageView": {
@@ -82,7 +73,6 @@
     <section id="stageAndScenesContainer" class="stageAndScenesContainer">
         <section id="stageView"></section>
         <section id="iframeContainer"></section>
-        <section id="textToolObject">asdasd asd asd asd asd asd </section>
         <canvas id="layoutCanvas"></canvas>
         <canvas id="stageCanvas"></canvas>
         <canvas id="drawingCanvas"></canvas>
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 852f480d..8c0f0fa0 100755
--- 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 },
@@ -780,12 +779,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