first iteration of adding serializable to ninja plus other changes to run the latest montage

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

2 files changed, 108 insertions, 28 deletions

diff --git a/js/components/layout/tools-properties.reel/tools-properties.html b/js/components/layout/tools-properties.reel/tools-properties.html
index e7d1ac8b..6b766532 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.html
+++ b/js/components/layout/tools-properties.reel/tools-properties.html
@@ -12,37 +12,37 @@
         <script type="text/montage-serialization">
         {
 
-            "selectionProperties1": {
+            "selectionProperties": {
                 "prototype": "js/components/tools-properties/selection-properties.reel",
                 "properties": {
                     "element": {"#": "selectionProperties"}
                 }
             },
-            "object3DProperties1": {
+            "object3DProperties": {
                 "prototype": "js/components/tools-properties/object3d-properties.reel[Object3DProperties]",
                 "properties": {
                     "element": {"#": "object3DProperties"}
                 }
             },
-            "tagProperties1": {
+            "tagProperties": {
                 "prototype": "js/components/tools-properties/tag-properties.reel",
                 "properties": {
                     "element": {"#": "tagProperties"}
                 }
             },
-            "penProperties1": {
+            "penProperties": {
                 "prototype": "js/components/tools-properties/pen-properties.reel",
                 "properties": {
                     "element": {"#": "penProperties"}
                 }
             },
-            "textProperties1": {
+            "textProperties": {
                 "prototype": "js/components/tools-properties/text-properties.reel",
                 "properties": {
                     "element": {"#": "textProperties"}
                 }
             },
-            "shapeProperties1": {
+            "shapeProperties": {
                 "prototype": "js/components/tools-properties/shape-properties.reel",
                 "properties": {
                     "element": {"#": "shapeProperties"}
@@ -60,43 +60,43 @@
                     }
                 }
             },
-            "brushProperties1": {
+            "brushProperties": {
                 "prototype": "js/components/tools-properties/brush-properties.reel",
                 "properties": {
                     "element": {"#": "brushProperties"}
                 }
             },
-            "fillProperties1": {
+            "fillProperties": {
                 "prototype": "js/components/tools-properties/fill-properties.reel",
                 "properties": {
                     "element": {"#": "fillProperties"}
                 }
             },
-            "inkbottleProperties1": {
+            "inkbottleProperties": {
                 "prototype": "js/components/tools-properties/ink-bottle-properties.reel",
                 "properties": {
                     "element": {"#": "inkbottleProperties"}
                 }
             },
-            "eraserProperties1": {
+            "eraserProperties": {
                 "prototype": "js/components/tools-properties/eraser-properties.reel",
                 "properties": {
                     "element": {"#": "eraserProperties"}
                 }
             },
-            "rotateStageProperties1": {
+            "rotateStageProperties": {
                 "prototype": "js/components/tools-properties/rotate-stage-properties.reel",
                 "properties": {
                     "element": {"#": "rotateStageProperties"}
                 }
             },
-            "panProperties1": {
+            "panProperties": {
                 "prototype": "js/components/tools-properties/pan-properties.reel",
                 "properties": {
                     "element": {"#": "panProperties"}
                 }
             },
-            "zoomProperties1": {
+            "zoomProperties": {
                 "prototype": "js/components/tools-properties/zoom-properties.reel",
                 "properties": {
                     "element": {"#": "zoomProperties"}
@@ -121,20 +121,20 @@
                 "prototype": "js/components/layout/tools-properties.reel",
                 "properties": {
                     "element": {"#": "toolsProperties"},
-                    "selectionProperties":          {"@": "selectionProperties1"},
-                    "rotate3DProperties":           {"@": "object3DProperties1"},
-                    "translate3DProperties":        {"@": "object3DProperties1"},
-                    "tagProperties":                {"@": "tagProperties1"},
-                    "penProperties":                {"@": "penProperties1"},
-                    "textProperties":               {"@": "textProperties1"},
-                    "shapeProperties":              {"@": "shapeProperties1"},
-                    "brushProperties":              {"@": "brushProperties1"},
-                    "fillProperties":               {"@": "fillProperties1"},
-                    "inkbottleProperties":          {"@": "inkbottleProperties1"},
-                    "eraserProperties":             {"@": "eraserProperties1"},
-                    "rotateStageProperties":        {"@": "rotateStageProperties1"},
-                    "panProperties":                {"@": "panProperties1"},
-                    "zoomProperties":               {"@": "zoomProperties1"}
+                    "selectionProperties":          {"@": "selectionProperties"},
+                    "rotate3DProperties":           {"@": "object3DProperties"},
+                    "translate3DProperties":        {"@": "object3DProperties"},
+                    "tagProperties":                {"@": "tagProperties"},
+                    "penProperties":                {"@": "penProperties"},
+                    "textProperties":               {"@": "textProperties"},
+                    "shapeProperties":              {"@": "shapeProperties"},
+                    "brushProperties":              {"@": "brushProperties"},
+                    "fillProperties":               {"@": "fillProperties"},
+                    "inkbottleProperties":          {"@": "inkbottleProperties"},
+                    "eraserProperties":             {"@": "eraserProperties"},
+                    "rotateStageProperties":        {"@": "rotateStageProperties"},
+                    "panProperties":                {"@": "panProperties"},
+                    "zoomProperties":               {"@": "zoomProperties"}
                 },
                 "bindings": {
                     "currentSelectedTool": {
diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js
index 6ea4ad85..c5a53abc 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.js
+++ b/js/components/layout/tools-properties.reel/tools-properties.js
@@ -9,6 +9,85 @@ var Component = require("montage/ui/component").Component;
 
 exports.ToolsProperties = Montage.create(Component, {
 
+    selectionProperties: {
+        value: null,
+        serializable: true
+    },
+
+    object3DProperties: {
+        value: null,
+        serializable: true
+    },
+    tagProperties: {
+        value: null,
+        serializable: true
+    },
+
+    penProperties: {
+        value: null,
+        serializable: true
+    },
+
+    textProperties: {
+        value: null,
+        serializable: true
+    },
+
+    shapeProperties: {