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 --- .../Materials/materials-library-panel.reel/materials-library-panel.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'js/panels/Materials') diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js index 2176c6d5..c600fd0d 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js @@ -68,7 +68,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { }, _materialInfo: { - enumerable:true + enumerable:true, + serializable: true }, _showMaterialPopup: { -- cgit v1.2.3 From 9d85430967237bd01334212de6f04db3bd222148 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 12 Jun 2012 11:21:21 -0700 Subject: adding more missing properties to the serialization Signed-off-by: Valerio Virgillito --- .../Materials/materials-popup.reel/materials-popup.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'js/panels/Materials') diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js index a4f758cf..0a32447e 100755 --- a/js/panels/Materials/materials-popup.reel/materials-popup.js +++ b/js/panels/Materials/materials-popup.reel/materials-popup.js @@ -12,6 +12,21 @@ var Montage = require("montage/core/core").Montage, //Exporting as MaterialsPopup exports.MaterialsPopup = Montage.create(Component, { //////////////////////////////////////////////////////////////////// + okButton: { + value: null, + serializable: true + }, + + cancelButton: { + value: null, + serializable: true + }, + + materialTitle: { + value: null, + serializable: true + }, + // Material Properties _materialName: { enumerable: true, -- cgit v1.2.3