diff options
author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/stage/stage.reel | |
parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/stage/stage.reel')
-rwxr-xr-x | js/stage/stage.reel/stage.js | 79 |
1 files changed, 70 insertions, 9 deletions
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 | ||
12 | exports.Stage = Montage.create(Component, { | 12 | exports.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 | ||