diff options
author | Armen Kesablyan | 2012-02-07 16:50:27 -0800 |
---|---|---|
committer | Armen Kesablyan | 2012-02-07 16:50:27 -0800 |
commit | 5f506542d28e12b707c3bfa41b53383519838477 (patch) | |
tree | bd58e9958d84dc3abef216d83f2e622ddb045b28 /js/stage | |
parent | 2082fa6912eec2ffabd2081b7706e8e1b88a9711 (diff) | |
download | ninja-5f506542d28e12b707c3bfa41b53383519838477.tar.gz |
Revert "Initial Text Tool Implementation"
This reverts commit 2082fa6912eec2ffabd2081b7706e8e1b88a9711.
Diffstat (limited to 'js/stage')
-rw-r--r-- | js/stage/stage.reel/stage.html | 12 | ||||
-rw-r--r-- | js/stage/stage.reel/stage.js | 7 |
2 files changed, 1 insertions, 18 deletions
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 @@ | |||
34 | } | 34 | } |
35 | } | 35 | } |
36 | }, | 36 | }, |
37 | |||
38 | "textTool": { | ||
39 | "module": "montage/ui/rich-text-editor.reel", | ||
40 | "name": "RichTextEditor", | ||
41 | "properties": { | ||
42 | "element" : {"#": "textToolObject"} | ||
43 | } | ||
44 | }, | ||
45 | 37 | ||
46 | "owner": { | 38 | "owner": { |
47 | "module": "js/stage/stage.reel", | 39 | "module": "js/stage/stage.reel", |
@@ -54,8 +46,7 @@ | |||
54 | "_canvas": {"#": "stageCanvas"}, | 46 | "_canvas": {"#": "stageCanvas"}, |
55 | "_drawingCanvas": {"#": "drawingCanvas"}, | 47 | "_drawingCanvas": {"#": "drawingCanvas"}, |
56 | "stageDeps": {"@": "StageDeps1"}, | 48 | "stageDeps": {"@": "StageDeps1"}, |
57 | "layout": {"@": "layout1"}, | 49 | "layout": {"@": "layout1"} |
58 | "textTool": {"@": "textTool"} | ||
59 | }, | 50 | }, |
60 | "bindings": { | 51 | "bindings": { |
61 | "currentDocumentStageView": { | 52 | "currentDocumentStageView": { |
@@ -73,7 +64,6 @@ | |||
73 | 64 | ||
74 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> | 65 | <section id="stageAndScenesContainer" class="stageAndScenesContainer"> |
75 | <section id="iframeContainer"></section> | 66 | <section id="iframeContainer"></section> |
76 | <section id="textToolObject">asdasd asd asd asd asd asd </section> | ||
77 | <section id="codeViewContainer"></section> | 67 | <section id="codeViewContainer"></section> |
78 | <canvas id="layoutCanvas"></canvas> | 68 | <canvas id="layoutCanvas"></canvas> |
79 | <canvas id="stageCanvas"></canvas> | 69 | <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; | |||
12 | 12 | ||
13 | exports.Stage = Montage.create(Component, { | 13 | exports.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 }, |
@@ -781,12 +780,6 @@ exports.Stage = Montage.create(Component, { | |||
781 | } | 780 | } |
782 | }, | 781 | }, |
783 | 782 | ||
784 | toViewportCoordinates: { | ||
785 | value: function(x,y) { | ||
786 | return [x + this._userContentLeft, y + this._userContentTop]; | ||
787 | } | ||
788 | }, | ||
789 | |||
790 | setZoom: { | 783 | setZoom: { |
791 | value: function(value) { | 784 | value: function(value) { |
792 | if(!this._firstDraw) | 785 | if(!this._firstDraw) |