Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts: js/controllers/elements/shapes-controller.js js/data/pi/pi-data.js js/panels/properties/content.reel/content.js
author: Jose Antonio Marquez 2012-02-08 13:14:29 -0800
committer: Jose Antonio Marquez 2012-02-08 13:14:29 -0800
commit: 9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch)
tree: e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/components/treeview/ninja-branch.reel/ninja-branch.html
parent: aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent: 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
download: ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz
1 files changed, 150 insertions, 0 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html
new file mode 100644
index 00000000..4d557a94
--- /dev/null
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<!-- <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> -->
+<html lang="en">
+<head>
+    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+    <link href="ninja-branch.css" rel="stylesheet" type="text/css" />
+    <script type="text/montage-serialization">
+    {
+        "owner": {
+            "module" : "js/components/treeview/ninja-branch.reel",
+            "name" : "Branch",
+            "properties" : {
+                "element" : {"#" : "branch"},
+                "label" : { "@" : "textComponent" },
+                "branchList": {"#" : "branchList"},
+                "arrayController": {"@": "arrayController" },
+                "repetition": {"@": "repetition"},
+                "leafComponent": {"@": "leaf"},
+                "branchComponent": {"@": "branch"},
+                "collapser": {"#": "branchCollapser" }
+            }
+        },
+        "textComponent" : {
+            "module" : "montage/ui/dynamic-text.reel",
+            "name" : "DynamicText",
+            "properties" : {
+                "element" : { "#" : "label" }
+            },
+            "bindings" : {
+                "value" : {
+                    "boundObject" : {"@": "owner"},
+                    "boundObjectPropertyPath": "_labelText",
+                    "oneway": true
+                }
+            }
+        },
+        "arrayController": {
+            "module": "montage/ui/controller/array-controller",
+            "name": "ArrayController",
+            "bindings": {
+                "content": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "childNodes"
+                }
+            }
+        },
+        "leaf": {
+            "module": "js/components/treeview/ninja-leaf.reel",
+            "name": "Leaf",
+            "bindings": {
+                "sourceObject": {
+                    "boundObject": {"@": "repetition" },
+                    "boundObjectPropertyPath": "objectAtCurrentIteration",
+                    "oneway": true
+                },
+                "labelKey" : {
+                    "boundObject": {"@": "owner" },
+                    "boundObjectPropertyPath": "labelKey",
+                    "oneway": true
+                },
+                "branchKey" : {
+                    "boundObject": {"@": "owner" },
+                    "boundObjectPropertyPath": "branchKey",
+                    "oneway": true
+                },
+                "treeView" : {
+                    "boundObject": {"@": "owner" },
+                    "boundObjectPropertyPath": "treeView",
+                    "oneway": true
+                }
+            }
+        },
+        "branch": {
+            "module": "js/components/treeview/ninja-branch.reel",
+            "name": "Branch",
+            "bindings": {
+                "sourceObject": {
+                    "boundObject": {"@": "repetition" },
+                    "boundObjectPropertyPath": "objectAtCurrentIteration",
+                    "oneway": true
+                },
+                "labelKey" : {
+                    "boundObject": {"@": "owner" },
+                    "boundObjectPropertyPath": "labelKey",
+                    "oneway": true
+                },
+                "branchKey" : {
+                    "boundObject": {"@": "owner" },
+                    "boundObjectPropertyPath": "branchKey",
+                    "oneway": true
+                },
+                "treeView" : {
+                    "boundObject": {"@": "owner" },
+                    "boundObjectPropertyPath": "treeView",
+                    "oneway": true
+                }
+            }
+        },
+        "repetition": {
+            "module": "montage/ui/repetition.reel",
+            "name": "Repetition",
+            "properties": {
+                "element": { "#": "branchList" },
+                "contentController": {"@": "arrayController" }
+            }
+        },
+        "substitution": {
+            "module": "montage/ui/substitution.reel",
+            "name": "Substitution",
+            "properties": {
+                "element": {"#": "treeItem"},
+                "switchComponents": {
+                    "leaf": {"@": "leaf"},
+                    "branch": {"@": "branch"}
+                }
+            },
+            "bindings": {
+                "switchValue": {
+                    "boundObject": {"@": "repetition"},
+                    "boundObjectPropertyPath": "objectAtCurrentIteration.treeNodeType",
+                    "oneway": true
+                }
+            }
+        }
+    }
+    </script>
+</head>
+<body>
+    <div id="branch" class="branch">
+        <div id="label" class="branch-label"></div>
+        <div id="branchCollapser" class="branchCollapser">
+            <ul id="branchList">
+                <li id="treeItem"></li>
+            </ul>    
+        </div>
+        
+    </div>
+</body>
+</html>
+\ No newline at end of file
author	Jose Antonio Marquez	2012-02-08 13:14:29 -0800
committer	Jose Antonio Marquez	2012-02-08 13:14:29 -0800
commit	9b45b897949bf934c8bf2c90ee2ff78f8713cb12 (patch)
tree	e7c276a3934c823cab894f46ee7dc5d3eda9ca83 /js/components/treeview/ninja-branch.reel/ninja-branch.html
parent	aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent	10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
download	ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz

diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html new file mode 100644 index 00000000..4d557a94 --- /dev/null +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html
@@ -0,0 +1,150 @@
	1	<!DOCTYPE html>
	2	<!-- <copyright>
	3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	6	</copyright> -->
	7	<html lang="en">
	8	<head>
	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
	10	<link href="ninja-branch.css" rel="stylesheet" type="text/css" />
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"module" : "js/components/treeview/ninja-branch.reel",
	15	"name" : "Branch",
	16	"properties" : {
	17	"element" : {"#" : "branch"},
	18	"label" : { "@" : "textComponent" },
	19	"branchList": {"#" : "branchList"},
	20	"arrayController": {"@": "arrayController" },
	21	"repetition": {"@": "repetition"},
	22	"leafComponent": {"@": "leaf"},
	23	"branchComponent": {"@": "branch"},
	24	"collapser": {"#": "branchCollapser" }
	25	}
	26	},
	27
	28	"textComponent" : {
	29	"module" : "montage/ui/dynamic-text.reel",
	30	"name" : "DynamicText",
	31	"properties" : {
	32	"element" : { "#" : "label" }
	33	},
	34	"bindings" : {
	35	"value" : {
	36	"boundObject" : {"@": "owner"},
	37	"boundObjectPropertyPath": "_labelText",
	38	"oneway": true
	39	}
	40	}
	41	},
	42
	43	"arrayController": {
	44	"module": "montage/ui/controller/array-controller",
	45	"name": "ArrayController",
	46	"bindings": {
	47	"content": {
	48	"boundObject": {"@": "owner"},
	49	"boundObjectPropertyPath": "childNodes"
	50	}
	51	}
	52	},
	53
	54	"leaf": {
	55	"module": "js/components/treeview/ninja-leaf.reel",
	56	"name": "Leaf",
	57	"bindings": {
	58	"sourceObject": {
	59	"boundObject": {"@": "repetition" },
	60	"boundObjectPropertyPath": "objectAtCurrentIteration",
	61	"oneway": true
	62	},
	63	"labelKey" : {
	64	"boundObject": {"@": "owner" },
	65	"boundObjectPropertyPath": "labelKey",
	66	"oneway": true
	67	},
	68	"branchKey" : {
	69	"boundObject": {"@": "owner" },
	70	"boundObjectPropertyPath": "branchKey",
	71	"oneway": true
	72	},
	73	"treeView" : {
	74	"boundObject": {"@": "owner" },
	75	"boundObjectPropertyPath": "treeView",
	76	"oneway": true
	77	}
	78	}
	79	},
	80
	81	"branch": {
	82	"module": "js/components/treeview/ninja-branch.reel",
	83	"name": "Branch",
	84	"bindings": {
	85	"sourceObject": {
	86	"boundObject": {"@": "repetition" },
	87	"boundObjectPropertyPath": "objectAtCurrentIteration",
	88	"oneway": true
	89	},
	90	"labelKey" : {
	91	"boundObject": {"@": "owner" },
	92	"boundObjectPropertyPath": "labelKey",
	93	"oneway": true
	94	},
	95	"branchKey" : {
	96	"boundObject": {"@": "owner" },
	97	"boundObjectPropertyPath": "branchKey",
	98	"oneway": true
	99	},
	100	"treeView" : {
	101	"boundObject": {"@": "owner" },
	102	"boundObjectPropertyPath": "treeView",
	103	"oneway": true
	104	}
	105	}
	106	},
	107
	108	"repetition": {
	109	"module": "montage/ui/repetition.reel",
	110	"name": "Repetition",
	111	"properties": {
	112	"element": { "#": "branchList" },
	113	"contentController": {"@": "arrayController" }
	114	}
	115	},
	116
	117	"substitution": {
	118	"module": "montage/ui/substitution.reel",
	119	"name": "Substitution",
	120	"properties": {
	121	"element": {"#": "treeItem"},
	122	"switchComponents": {
	123	"leaf": {"@": "leaf"},
	124	"branch": {"@": "branch"}
	125
	126	}
	127	},
	128	"bindings": {
	129	"switchValue": {
	130	"boundObject": {"@": "repetition"},
	131	"boundObjectPropertyPath": "objectAtCurrentIteration.treeNodeType",
	132	"oneway": true
	133	}
	134	}
	135	}
	136	}
	137	</script>
	138	</head>
	139	<body>
	140	<div id="branch" class="branch">
	141	<div id="label" class="branch-label"></div>
	142	<div id="branchCollapser" class="branchCollapser">
	143	<ul id="branchList">
	144	<li id="treeItem"></li>
	145	</ul>
	146	</div>
	147
	148	</div>
	149	</body>
	150	</html> \ No newline at end of file