From c48eeb01bd726895dc577d8b843b2a75883eee07 Mon Sep 17 00:00:00 2001
From: Ananya Sen
Date: Fri, 10 Feb 2012 16:03:52 -0800
Subject: Merge from /joseeight/ninja-internal/tree/FileIO

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
---
 js/stage/stage.reel/stage.js | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'js/stage/stage.reel/stage.js')

diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index 8c0f0fa0..852f480d 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -12,6 +12,7 @@ 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 },
@@ -779,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