fixing the breadcrumb

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-05-17 12:23:31 -0700
committer: Jose Antonio Marquez 2012-05-17 13:26:08 -0700
commit: 495a56081219c0c77814cb72f2d787195ef58285 (patch)
tree: 7909b8cbe077d988293d989d7eb3e6df58fb1710
parent: e713d437a3918b9e417d1a0bc9f11275fc9e6634 (diff)
download: ninja-495a56081219c0c77814cb72f2d787195ef58285.tar.gz
2 files changed, 19 insertions, 42 deletions
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index ae3e2022..0dabc781 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -32,30 +32,23 @@
                        }
                    ],
                    "bindings": {
-                        "label": {
+                        "label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
-                            "boundObject": {"@": "repetition1"},
+                        "value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.label",
+                    }
-                            "oneway": true
+                },
-                        },
-                        "value": {
+                "buttonsListController": {
-                            "boundObject": {"@": "repetition1"},
+                    "prototype": "montage/ui/controller/array-controller",
-                            "boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid",
+                    "bindings": {
-                            "oneway": true
+                        "content": {"<<->": "@owner.containerElements"}
-                        }
                    }
                },
-                "repetition1": {
+                "buttonsList": {
                    "prototype": "montage/ui/repetition.reel",
                    "properties": {
-                        "element": {"#": "breadcrumb_container"}
+                        "element": {"#": "breadcrumb_container"},
-                    },
+                        "contentController": {"@": "buttonsListController"}
-                    "bindings": {
-                        "objects": {
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "containerElements",
-                            "oneway": true
-                        }
                    }
                },
@@ -65,11 +58,7 @@
                        "element": {"#": "disabledCondition"}
                    },
                    "bindings": {
-                        "condition": {
+                        "condition": {"<-": "@owner.disabled"}
-                            "boundObject": {"@": "owner"},
-                            "boundObjectPropertyPath": "disabled",
-                            "oneway": true
-                        }
                    }
                }
            }
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index c1b021a3..d2a6b1e4 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -60,30 +60,18 @@ exports.Breadcrumb = Montage.create(Component, {
        value: function() {
            var parentNode;
-            this.containerElements.length = 0;
+//            delete this.containerElements;
+                this.containerElements = [];
            parentNode = this.container;
-            // This is for the old template support.
+            while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
-            // TODO: Remove marker for old template: NINJA-STAGE-REWORK
-            if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
-                while(parentNode.id !== "UserContent") {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-                // This is always the top container which is now hardcoded to body
-                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
-            } else {
-                while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
-                    this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
-                    parentNode = parentNode.parentNode;
-                }
-                // This is always the top container which is now hardcoded to body
                this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
+                parentNode = parentNode.parentNode;
            }
+            // This is always the top container which is now hardcoded to body
+            this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
        }
    },
author	Valerio Virgillito	2012-05-17 12:23:31 -0700
committer	Jose Antonio Marquez	2012-05-17 13:26:08 -0700
commit	495a56081219c0c77814cb72f2d787195ef58285 (patch)
tree	7909b8cbe077d988293d989d7eb3e6df58fb1710
parent	e713d437a3918b9e417d1a0bc9f11275fc9e6634 (diff)
download	ninja-495a56081219c0c77814cb72f2d787195ef58285.tar.gz

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html index ae3e2022..0dabc781 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.html +++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -32,30 +32,23 @@
32	}	32	}
33	],	33	],
34	"bindings": {	34	"bindings": {
35	"label": {	35	"label": {"<-": "@buttonsList.objectAtCurrentIteration.label"},
36	"boundObject": {"@": "repetition1"},	36	"value": {"<-": "@buttonsList.objectAtCurrentIteration.nodeUuid"}
37	"boundObjectPropertyPath": "objectAtCurrentIteration.label",	37	}
38	"oneway": true	38	},
39	},	39
40	"value": {	40	"buttonsListController": {
41	"boundObject": {"@": "repetition1"},	41	"prototype": "montage/ui/controller/array-controller",
42	"boundObjectPropertyPath": "objectAtCurrentIteration.nodeUuid",	42	"bindings": {
43	"oneway": true	43	"content": {"<<->": "@owner.containerElements"}
44	}
45	}	44	}
46	},	45	},
47		46
48	"repetition1": {	47	"buttonsList": {
49	"prototype": "montage/ui/repetition.reel",	48	"prototype": "montage/ui/repetition.reel",
50	"properties": {	49	"properties": {
51	"element": {"#": "breadcrumb_container"}	50	"element": {"#": "breadcrumb_container"},
52	},	51	"contentController": {"@": "buttonsListController"}
53	"bindings": {
54	"objects": {
55	"boundObject": {"@": "owner"},
56	"boundObjectPropertyPath": "containerElements",
57	"oneway": true
58	}
59	}	52	}
60	},	53	},
61		54
@@ -65,11 +58,7 @@
65	"element": {"#": "disabledCondition"}	58	"element": {"#": "disabledCondition"}
66	},	59	},
67	"bindings": {	60	"bindings": {
68	"condition": {	61	"condition": {"<-": "@owner.disabled"}
69	"boundObject": {"@": "owner"},
70	"boundObjectPropertyPath": "disabled",
71	"oneway": true
72	}
73	}	62	}
74	}	63	}
75	}	64	}


diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js index c1b021a3..d2a6b1e4 100755 --- a/js/components/layout/bread-crumb.reel/bread-crumb.js +++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -60,30 +60,18 @@ exports.Breadcrumb = Montage.create(Component, {
60	value: function() {	60	value: function() {
61	var parentNode;	61	var parentNode;
62		62
63	this.containerElements.length = 0;	63	// delete this.containerElements;
		64	this.containerElements = [];
64		65
65	parentNode = this.container;	66	parentNode = this.container;
66		67
67	// This is for the old template support.	68	while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
68	// TODO: Remove marker for old template: NINJA-STAGE-REWORK
69	if(this.application.ninja.currentDocument.documentRoot.id === "UserContent") {
70	while(parentNode.id !== "UserContent") {
71	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
72	parentNode = parentNode.parentNode;
73	}
74
75	// This is always the top container which is now hardcoded to body
76	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": "Body"});
77	} else {
78	while(parentNode !== this.application.ninja.currentDocument.documentRoot) {
79	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
80	parentNode = parentNode.parentNode;
81	}
82
83	// This is always the top container which is now hardcoded to body
84	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});	69	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
		70	parentNode = parentNode.parentNode;
85	}	71	}
86		72
		73	// This is always the top container which is now hardcoded to body
		74	this.containerElements.unshift({"node": parentNode, "nodeUuid":parentNode.uuid, "label": parentNode.nodeName});
87	}	75	}
88	},	76	},
89		77