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 <valerio@motorola.com>
---
 .../layout/bread-crumb.reel/bread-crumb.html       |   2 +-
 .../layout/bread-crumb.reel/bread-crumb.js         |   5 +
 .../layout/document-bar.reel/document-bar.html     |   2 -
 .../layout/document-bar.reel/document-bar.js       |   7 +-
 .../layout/documents-tab.reel/documents-tab.js     |   3 +-
 .../layout/tool-button.reel/tool-button.html       |   2 +-
 .../layout/tools-list.reel/tools-list.html         |   5 +-
 js/components/layout/tools-list.reel/tools-list.js | 106 +++++++++++++++++----
 .../tools-properties.reel/tools-properties.html    |  54 +++++------
 .../tools-properties.reel/tools-properties.js      |  82 +++++++++++++++-
 10 files changed, 211 insertions(+), 57 deletions(-)

(limited to 'js/components/layout')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 0dabc781..68f3be2b 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -40,7 +40,7 @@
                 "buttonsListController": {
                     "prototype": "montage/ui/controller/array-controller",
                     "bindings": {
-                        "content": {"<<->": "@owner.containerElements"}
+                        "content": {"<->": "@owner.containerElements"}
                     }
                 },
 
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ac131f2c..d525c813 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -9,6 +9,11 @@ var Montage = require("montage/core/core").Montage,
 
 exports.Breadcrumb = Montage.create(Component, {
 
+    breadcrumbBt: {
+        value: null,
+        serializable: true
+    },
+
     _currentDocument: {
         enumerable: false,
         value: null
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index a35b5590..889160ad 100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -45,8 +45,6 @@
                 "prototype": "js/components/layout/document-bar.reel",
                 "properties": {
                     "element": {"#": "documentBar"},
-                    "designView": {"#": "design"},
-                    "codeView": {"#": "code"},
                     "zoomControl": {"@": "hottext1"}
                 }
             }
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 1cb0bd90..74ba11c2 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -61,7 +61,8 @@ exports.DocumentBar = Montage.create(Component, {
     },
 
     zoomControl: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     _type: {
@@ -148,8 +149,8 @@ exports.DocumentBar = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            this.designView.addEventListener("click", this, false);
-            this.codeView.addEventListener("click", this, false);
+//            this.designView.addEventListener("click", this, false);
+//            this.codeView.addEventListener("click", this, false);
 
         }
     },
diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js
index 41c98b30..b72056f8 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.js
+++ b/js/components/layout/documents-tab.reel/documents-tab.js
@@ -9,6 +9,7 @@ var Component = require("montage/ui/component").Component;
 
 exports.DocumentsTab = Montage.create(Component, {
     contentController: {
-        value: null
+        value: null,
+        serializable: true
     }
 });
\ No newline at end of file
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index a329f646..936c47ef 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -18,7 +18,7 @@
                     "element": {"#": "toolBarButton"}
                 },
                 "bindings": {
-                    "selected": {"<<->": "@owner.data.selected"},
+                    "selected": {"<->": "@owner.data.selected"},
                     "subselected": {"<-": "@owner.data.subtools.selected"}
                 }
             }
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 4e5b85ee..3a9661f5 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -126,10 +126,7 @@
                     "EraserTool":             {"@": "EraserTool1"},
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
-                    "ZoomTool":               {"@": "ZoomTool1"},
-                    "components": [
-                        {"@": "repetition1"}
-                    ]
+                    "ZoomTool":               {"@": "ZoomTool1"}
                 }
             }
     	}
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index c46c065e..e36001a3 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -9,23 +9,95 @@ var Component = require("montage/ui/component").Component;
 
 exports.ToolsList = Montage.create(Component, {
 
-    SelectionTool:          { value: null },
-    Rotate3DTool:           { value: null },
-    Translate3DTool:        { value: null },
-    TagTool:                { value: null },
-    PenTool:                { value: null },
-    TextTool:               { value: null },
-    ShapeTool:              { value: null },
-    OvalTool:               { value: null },
-    RectTool:               { value: null },
-    LineTool:               { value: null },
-    BrushTool:              { value: null },
-    FillTool:               { value: null },
-    InkBottleTool:          { value: null },
-    EraserTool:             { value: null },
-    RotateStageTool3D:      { value: null },
-    PanTool:                { value: null },
-    ZoomTool:               { value: null },
+    toolsData: {
+        value: null,
+        serializable: true
+    },
+
+    SelectionTool: {
+        value: null,
+        serializable: true
+    },
+
+    Rotate3DTool: {
+        value: null,
+        serializable: true
+    },
+
+    Translate3DTool: {
+        value: null,
+        serializable: true
+    },
+
+    TagTool: {
+        value: null,
+        serializable: true
+    },
+
+    PenTool: {
+        value: null,
+        serializable: true
+    },
+
+    TextTool: {
+        value: null,
+        serializable: true
+    },
+
+    ShapeTool: {
+        value: null,
+        serializable: true
+    },
+
+    OvalTool: {
+        value: null,
+        serializable: true
+    },
+
+    RectTool: {
+        value: null,
+        serializable: true
+    },
+
+    LineTool: {
+        value: null,
+        serializable: true
+    },
+
+    BrushTool: {
+        value: null,
+        serializable: true
+    },
+
+    FillTool: {
+        value: null,
+        serializable: true
+    },
+
+    InkBottleTool: {
+        value: null,
+        serializable: true
+    },
+
+    EraserTool: {
+        value: null,
+        serializable: true
+    },
+
+    RotateStageTool3D: {
+        value: null,
+        serializable: true
+    },
+
+    PanTool: {
+        value: null,
+        serializable: true
+    },
+
+    ZoomTool: {
+        value: null,
+        serializable: true
+    },
 
     _currentDocument: {
         enumerable: false,
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: {
+        value: null,
+        serializable: true
+    },
+
+    brushProperties: {
+        value: null,
+        serializable: true
+    },
+
+    fillProperties: {
+        value: null,
+        serializable: true
+    },
+
+    inkbottleProperties: {
+        value: null,
+        serializable: true
+    },
+
+    eraserProperties: {
+        value: null,
+        serializable: true
+    },
+
+    rotateStageProperties: {
+        value: null,
+        serializable: true
+    },
+
+    panProperties: {
+        value: null,
+        serializable: true
+    },
+
+    zoomProperties: {
+        value: null,
+        serializable: true
+    },
+
+    rotate3DProperties: {
+        value: null,
+        serializable: true
+    },
+
+    translate3DProperties: {
+        value: null,
+        serializable: true
+    },
+
+    toolsData: {
+        value: null,
+        serializable: true
+    },
+
     _currentDocument: {
         enumerable: false,
         value: null
@@ -28,7 +107,8 @@ exports.ToolsProperties = Montage.create(Component, {
 
             this.disabled = !this._currentDocument;
 
-        }
+        },
+        serializable: true
     },
 
     _disabled: {
-- 
cgit v1.2.3


From 806974142d44afdd23534bf2d18eff0a8e701e0c Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Fri, 8 Jun 2012 16:59:59 -0700
Subject: rewrite: currentSelectedContainer -> domContainer

Fixed the currentSelectedContainer by removing bindings and using property change on the current document
added the red outline back.

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 .../layout/bread-crumb.reel/bread-crumb.js         | 42 +++++++++-------------
 1 file changed, 16 insertions(+), 26 deletions(-)

(limited to 'js/components/layout')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index ac131f2c..260922b3 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -51,22 +51,6 @@ exports.Breadcrumb = Montage.create(Component, {
         }
     },
 
-    _container:{
-        value:null
-    },
-
-    container: {
-        set: function(value) {
-            if(this._container !== value) {
-                this._container = value;
-                this.createContainerElements();
-            }
-        },
-        get: function() {
-            return this._container;
-        }
-    },
-
     containerElements: {
         value: []
     },
@@ -74,31 +58,37 @@ exports.Breadcrumb = Montage.create(Component, {
     prepareForDraw: {
         value: function() {
             this.breadcrumbBt.addEventListener("action", this, false);
+            this.addPropertyChangeListener("currentDocument.model.domContainer", this)
         }
     },
 
-    createContainerElements: {
+    handleChange: {
         value: function() {
-            var parentNode;
+            if(this.currentDocument && this.currentDocument.model.getProperty("domContainer")) {
+                this.createContainerElements(this.currentDocument.model.getProperty("domContainer"));
+            }
+        }
+    },
+
+    createContainerElements: {
+        value: function(container) {
 
 //            delete this.containerElements;
                 this.containerElements = [];
 
-            parentNode = this.container;
-
-            while(parentNode !== this.currentDocument.model.documentRoot) {
-                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                parentNode = parentNode.parentNode;
+            while(container !== this.currentDocument.model.documentRoot) {
+                this.containerElements.unshift({"node": container, "nodeUuid":container.uuid, "label": container.nodeName});
+                container = container.parentNode;
             }
 
             // This is always the top container which is now hardcoded to body
-            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+            this.containerElements.unshift({"node": container, "nodeUuid":container.uuid, "label": container.nodeName});
         }
     },
 
     handleAction: {
         value: function(evt) {
-            if(evt.target.value === this.container.uuid) {
+            if(evt.target.value === this.currentDocument.model.domContainer.uuid) {
                 return;
             }
 
@@ -109,7 +99,7 @@ exports.Breadcrumb = Montage.create(Component, {
             }
 
             // TODO: This is bound 2 ways, update the internal property
-            this.application.ninja.currentSelectedContainer = this.containerElements[i].node;
+            this.currentDocument.model.domContainer = this.containerElements[i].node;
         }
     }
 });
-- 
cgit v1.2.3


From 1b510d86ebdd3cb58162e20cb9412e93d6f473c1 Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Mon, 11 Jun 2012 23:47:29 -0700
Subject: adding more missing properties

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/layout/document-entry.reel/document-entry.js | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'js/components/layout')

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 94056007..e2a36c46 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -9,6 +9,11 @@ var Component = require("montage/ui/component").Component;
 
 exports.DocumentEntry = Montage.create(Component, {
 
+    label: {
+        value: null,
+        serializable: true
+    },
+
     _document: {
         value: null
     },
-- 
cgit v1.2.3


From a75947d69f571d723552f926f94d195514a01cbd Mon Sep 17 00:00:00 2001
From: Valerio Virgillito
Date: Tue, 12 Jun 2012 23:04:07 -0700
Subject: fixed document switching issues

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
---
 js/components/layout/bread-crumb.reel/bread-crumb.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'js/components/layout')

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 2f493102..a3c743a4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -105,6 +105,7 @@ exports.Breadcrumb = Montage.create(Component, {
 
             // TODO: This is bound 2 ways, update the internal property
             this.currentDocument.model.domContainer = this.containerElements[i].node;
+            this.application.ninja.selectionController.executeSelectElement();
         }
     }
 });
-- 
cgit v1.2.3