aboutsummaryrefslogtreecommitdiff
path: root/js/stage
diff options
context:
space:
mode:
authorhwc4872012-06-13 14:04:09 -0700
committerhwc4872012-06-13 14:04:09 -0700
commit3e481dd581e0305dd8b572ed0d17e86622223464 (patch)
treeaca2b28aa72857a52e047fb94090c34ab8dd1c2c /js/stage
parenta7aa51e6b91623772eef54b827616432838b560e (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/stage')
-rwxr-xr-xjs/stage/layout.js11
-rwxr-xr-xjs/stage/stage-deps.js5
-rwxr-xr-xjs/stage/stage.reel/stage.js79
3 files changed, 85 insertions, 10 deletions
diff --git a/js/stage/layout.js b/js/stage/layout.js
index 1831f4e7..28484b71 100755
--- a/js/stage/layout.js
+++ b/js/stage/layout.js
@@ -17,7 +17,16 @@ var Montage = require("montage/core/core").Montage,
17 17
18exports.Layout = Montage.create(Component, { 18exports.Layout = Montage.create(Component, {
19 19
20 canvas: { value: null }, 20 canvas: {
21 value: null,
22 serializable: true
23 },
24
25 stage: {
26 value: null,
27 serializable: true
28 },
29
21 ctx: { value: null }, 30 ctx: { value: null },
22 31
23 drawFillColor: { value: 'rgba(255,255,255,1)' }, 32 drawFillColor: { value: 'rgba(255,255,255,1)' },
diff --git a/js/stage/stage-deps.js b/js/stage/stage-deps.js
index 762c2529..462f7ca5 100755
--- a/js/stage/stage-deps.js
+++ b/js/stage/stage-deps.js
@@ -15,6 +15,11 @@ var Montage = require("montage/core/core").Montage,
15 15
16exports.StageDeps = Montage.create(Component, { 16exports.StageDeps = Montage.create(Component, {
17 17
18 stage: {
19 value: null,
20 serializable: true
21 },
22
18 viewUtils: { 23 viewUtils: {
19 value: viewUtils 24 value: viewUtils
20 }, 25 },
diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js
index da109d45..129bcc33 100755
--- a/js/stage/stage.reel/stage.js
+++ b/js/stage/stage.reel/stage.js
@@ -11,6 +11,11 @@ var Montage = require("montage/core/core").Montage,
11 11
12exports.Stage = Montage.create(Component, { 12exports.Stage = Montage.create(Component, {
13 13
14 appModel: {
15 value: null,
16 serializable: true
17 },
18
14 // TODO - Need to figure out how to remove this dependency 19 // TODO - Need to figure out how to remove this dependency
15 // Needed by some tools that depend on selectionDrawn event to set up some logic 20 // Needed by some tools that depend on selectionDrawn event to set up some logic
16 drawNow: { value : false }, 21 drawNow: { value : false },
@@ -22,7 +27,10 @@ exports.Stage = Montage.create(Component, {
22 _canvasDrawingPrefs: { value: { "thickness" : 1.0, "color" : "#000" } }, 27 _canvasDrawingPrefs: { value: { "thickness" : 1.0, "color" : "#000" } },
23 drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } }, 28 drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } },
24 29
25 _iframeContainer: { value: null }, 30 _iframeContainer: {
31 value: null,
32 serializable: true
33 },
26 34
27 _scrollFlag: {value: true, writable: true}, 35 _scrollFlag: {value: true, writable: true},
28 outFlag: { value: false, writable: true }, 36 outFlag: { value: false, writable: true },
@@ -88,29 +96,82 @@ exports.Stage = Montage.create(Component, {
88 }, 96 },
89 97
90 /** MAIN CANVASES **/ 98 /** MAIN CANVASES **/
91 _canvas: { value: null }, // selection bounds, 3d normals and the overall 3d selection box use this canvas 99 // selection bounds, 3d normals and the overall 3d selection box use this canvas
92 canvas: { get: function() { return this._canvas; } }, 100 _canvas: {
101 value: null,
102 serializable: true
103 },
104
105 canvas: {
106 get: function() {
107 return this._canvas;
108 }
109 },
93 110
94 _context: { value: null }, 111 _context: { value: null },
95 context: { get: function() { return this._context; } }, 112 context: { get: function() { return this._context; } },
96 113
97 _layoutCanvas: { value: null }, 114 _layoutCanvas: {
98 layoutCanvas: { get: function() { return this._layoutCanvas; } }, 115 value: null,
116 serializable: true
117 },
118
119 layoutCanvas: {
120 get: function() {
121 return this._layoutCanvas;
122 }
123 },
99 124
100 _gridCanvas: { value: null }, 125 _gridCanvas: {
101 gridCanvas: { get: function() { return this._gridCanvas; } }, 126 value: null,
127 serializable: true
128 },
129
130 gridCanvas: {
131 get: function() {
132 return this._gridCanvas;
133 }
134 },
102 135
103 _gridContext: { value: null }, 136 _gridContext: { value: null },
104 gridContext: { get: function() { return this._gridContext; } }, 137 gridContext: { get: function() { return this._gridContext; } },
105 138
106 _drawingCanvas: { value: null }, 139 _drawingCanvas: {
107 drawingCanvas: { get: function() { return this._drawingCanvas; } }, 140 value: null,
141 serializable: true
142 },
143
144 drawingCanvas: {
145 get: function() {
146 return this._drawingCanvas;
147 }
148 },
108 149
109 _drawingContext: { value: null }, 150 _drawingContext: { value: null },
110 drawingContext: { get: function() { return this._drawingContext; } }, 151 drawingContext: { get: function() { return this._drawingContext; } },
111 152
112 _clickPoint: { value: { x: { value: null }, y: { value: null } } }, 153 _clickPoint: { value: { x: { value: null }, y: { value: null } } },
113 154
155 stageDeps: {
156 value: null,
157 serializable: true
158 },
159
160 layout: {
161 value: null,
162 serializable: true
163 },
164
165 textTool: {
166 value: null,
167 serializable: true
168 },
169
170 focusManager: {
171 value: null,
172 serializable: true
173 },
174
114 // We will set this to false while moving objects to improve performance 175 // We will set this to false while moving objects to improve performance
115 showSelectionBounds: { value: true }, 176 showSelectionBounds: { value: true },
116 177