aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorAnanya Sen2012-02-10 16:05:27 -0800
committerAnanya Sen2012-02-10 16:05:27 -0800
commitf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (patch)
treef716757dab75d7626297893c7f4aca3596d606de /js/stage
parentc48eeb01bd726895dc577d8b843b2a75883eee07 (diff)
downloadninja-f3dc624fa464a79fd8e8cec1ddd16ed2109bda23.tar.gz
Revert "Merge from /joseeight/ninja-internal/tree/FileIO"
This reverts commit c48eeb01bd726895dc577d8b843b2a75883eee07. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/stage.reel/stage.html12
-rwxr-xr-xjs/stage/stage.reel/stage.js7
2 files changed, 1 insertions, 18 deletions
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 @@
42 } 42 }
43 } 43 }
44 }, 44 },
45
46 "textTool": {
47 "module": "node_modules/labs/rich-text-editor.reel",
48 "name": "RichTextEditor",
49 "properties": {
50 "element" : {"#": "textToolObject"}
51 }
52 },
53 45
54 "owner": { 46 "owner": {
55 "module": "js/stage/stage.reel", 47 "module": "js/stage/stage.reel",
@@ -62,8 +54,7 @@
62 "_drawingCanvas": {"#": "drawingCanvas"}, 54 "_drawingCanvas": {"#": "drawingCanvas"},
63 "stageDeps": {"@": "StageDeps1"}, 55 "stageDeps": {"@": "StageDeps1"},
64 "layout": {"@": "layout1"}, 56 "layout": {"@": "layout1"},
65 "stageView": {"@": "stageView"}, 57 "stageView": {"@": "stageView"}
66 "textTool": {"@": "textTool"}
67 }, 58 },
68 "bindings": { 59 "bindings": {
69 "currentDocumentStageView": { 60 "currentDocumentStageView": {
@@ -82,7 +73,6 @@
82 <section id="stageAndScenesContainer" class="stageAndScenesContainer"> 73 <section id="stageAndScenesContainer" class="stageAndScenesContainer">
83 <section id="stageView"></section> 74 <section id="stageView"></section>
84 <section id="iframeContainer"></section> 75 <section id="iframeContainer"></section>
85 <section id="textToolObject">asdasd asd asd asd asd asd </section>
86 <canvas id="layoutCanvas"></canvas> 76 <canvas id="layoutCanvas"></canvas>
87 <canvas id="stageCanvas"></canvas> 77 <canvas id="stageCanvas"></canvas>
88 <canvas id="drawingCanvas"></canvas> 78 <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;
12 12
13exports.Stage = Montage.create(Component, { 13exports.Stage = Montage.create(Component, {
14 14
15 textTool: { value: null },
16 // TODO - Need to figure out how to remove this dependency 15 // TODO - Need to figure out how to remove this dependency
17 // Needed by some tools that depend on selectionDrawn event to set up some logic 16 // Needed by some tools that depend on selectionDrawn event to set up some logic
18 drawNow: { value : false }, 17 drawNow: { value : false },
@@ -780,12 +779,6 @@ exports.Stage = Montage.create(Component, {
780 } 779 }
781 }, 780 },
782 781
783 toViewportCoordinates: {
784 value: function(x,y) {
785 return [x + this._userContentLeft, y + this._userContentTop];
786 }
787 },
788
789 setZoom: { 782 setZoom: {
790 value: function(value) { 783 value: function(value) {
791 if(!this._firstDraw) 784 if(!this._firstDraw)