From 0e1a276f19ea70009c5a649e9667861d7c346a7e Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Wed, 6 Jun 2012 00:25:27 -0700 Subject: first iteration of adding serializable to ninja plus other changes to run the latest montage Signed-off-by: Valerio Virgillito --- js/stage/stage.reel/stage.js | 79 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 70 insertions(+), 9 deletions(-) (limited to 'js/stage/stage.reel') diff --git a/js/stage/stage.reel/stage.js b/js/stage/stage.reel/stage.js index d8f7313b..0ad004d6 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, exports.Stage = Montage.create(Component, { + appModel: { + value: null, + serializable: true + }, + // 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 }, @@ -22,7 +27,10 @@ exports.Stage = Montage.create(Component, { _canvasDrawingPrefs: { value: { "thickness" : 1.0, "color" : "#000" } }, drawingContextPreferences: { get: function() { return this._canvasDrawingPrefs; } }, - _iframeContainer: { value: null }, + _iframeContainer: { + value: null, + serializable: true + }, _scrollFlag: {value: true, writable: true}, outFlag: { value: false, writable: true }, @@ -88,29 +96,82 @@ exports.Stage = Montage.create(Component, { }, /** MAIN CANVASES **/ - _canvas: { value: null }, // selection bounds, 3d normals and the overall 3d selection box use this canvas - canvas: { get: function() { return this._canvas; } }, + // selection bounds, 3d normals and the overall 3d selection box use this canvas + _canvas: { + value: null, + serializable: true + }, + + canvas: { + get: function() { + return this._canvas; + } + }, _context: { value: null }, context: { get: function() { return this._context; } }, - _layoutCanvas: { value: null }, - layoutCanvas: { get: function() { return this._layoutCanvas; } }, + _layoutCanvas: { + value: null, + serializable: true + }, + + layoutCanvas: { + get: function() { + return this._layoutCanvas; + } + }, - _gridCanvas: { value: null }, - gridCanvas: { get: function() { return this._gridCanvas; } }, + _gridCanvas: { + value: null, + serializable: true + }, + + gridCanvas: { + get: function() { + return this._gridCanvas; + } + }, _gridContext: { value: null }, gridContext: { get: function() { return this._gridContext; } }, - _drawingCanvas: { value: null }, - drawingCanvas: { get: function() { return this._drawingCanvas; } }, + _drawingCanvas: { + value: null, + serializable: true + }, + + drawingCanvas: { + get: function() { + return this._drawingCanvas; + } + }, _drawingContext: { value: null }, drawingContext: { get: function() { return this._drawingContext; } }, _clickPoint: { value: { x: { value: null }, y: { value: null } } }, + stageDeps: { + value: null, + serializable: true + }, + + layout: { + value: null, + serializable: true + }, + + textTool: { + value: null, + serializable: true + }, + + focusManager: { + value: null, + serializable: true + }, + // We will set this to false while moving objects to improve performance showSelectionBounds: { value: true }, -- cgit v1.2.3