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
parent: aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent: 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
download: ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz
16 files changed, 1039 insertions, 0 deletions
diff --git a/js/components/treeview/branch.reel/branch.css b/js/components/treeview/branch.reel/branch.css
new file mode 100644
index 00000000..0f4e4a87
--- /dev/null
+++ b/js/components/treeview/branch.reel/branch.css
@@ -0,0 +1,22 @@
+/* <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> */
+.treeRoot > .branch > ul {
+    margin-top: 0;
+}
+.branch > .branch-label {
+    font-weight: bold;
+    cursor: pointer;
+}
+.branch ul {
+    list-style: none;
+}
+.branch ul {
+    padding-left: 30px;
+}
+.branch .collapse {
+    display: none;
+}
+\ No newline at end of file
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html
new file mode 100644
index 00000000..b44a54c5
--- /dev/null
+++ b/js/components/treeview/branch.reel/branch.html
@@ -0,0 +1,147 @@
+<!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="branch.css" rel="stylesheet" type="text/css" />
+    <script type="text/montage-serialization">
+    {
+        "owner": {
+            "module" : "js/components/treeview/branch.reel",
+            "name" : "Branch",
+            "properties" : {
+                "element" : {"#" : "branch"},
+                "label" : { "@" : "textComponent" },
+                "branchList": {"#" : "branchList"},
+                "arrayController": {"@": "arrayController" },
+                "repetition": {"@": "repetition"},
+                "leafComponent": {"@": "leaf"},
+                "branchComponent": {"@": "branch"}
+            }
+        },
+        "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/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/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">
+        <span id="label" class="branch-label"></span>
+        <ul id="branchList">
+            <li id="treeItem"></li>
+        </ul>
+    </div>
+</body>
+</html>
+\ No newline at end of file
diff --git a/js/components/treeview/branch.reel/branch.js b/js/components/treeview/branch.reel/branch.js
new file mode 100644
index 00000000..892da71a
--- /dev/null
+++ b/js/components/treeview/branch.reel/branch.js
@@ -0,0 +1,48 @@
+/* <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> */
+var Montage = require("montage").Montage,
+    Component = require("montage/ui/component").Component,
+    TreeNode = require("js/components/treeview/tree-node").TreeNode;
+var Branch = exports.Branch = Montage.create(TreeNode, {
+    hasTemplate:{
+        value:true
+    },
+    repetition:{
+        value: null
+    },
+    prepareForDraw : {
+        value: function() {
+            t
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
parent	aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent	10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
download	ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz

diff --git a/js/components/treeview/branch.reel/branch.css b/js/components/treeview/branch.reel/branch.css new file mode 100644 index 00000000..0f4e4a87 --- /dev/null +++ b/js/components/treeview/branch.reel/branch.css
@@ -0,0 +1,22 @@
	1	/* <copyright>
	2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	5	</copyright> */
	6
	7	.treeRoot > .branch > ul {
	8	margin-top: 0;
	9	}
	10	.branch > .branch-label {
	11	font-weight: bold;
	12	cursor: pointer;
	13	}
	14	.branch ul {
	15	list-style: none;
	16	}
	17	.branch ul {
	18	padding-left: 30px;
	19	}
	20	.branch .collapse {
	21	display: none;
	22	} \ No newline at end of file


diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html new file mode 100644 index 00000000..b44a54c5 --- /dev/null +++ b/js/components/treeview/branch.reel/branch.html
@@ -0,0 +1,147 @@
	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="branch.css" rel="stylesheet" type="text/css" />
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"module" : "js/components/treeview/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	}
	25	},
	26
	27	"textComponent" : {
	28	"module" : "montage/ui/dynamic-text.reel",
	29	"name" : "DynamicText",
	30	"properties" : {
	31	"element" : { "#" : "label" }
	32	},
	33	"bindings" : {
	34	"value" : {
	35	"boundObject" : {"@": "owner"},
	36	"boundObjectPropertyPath": "_labelText",
	37	"oneway": true
	38	}
	39	}
	40	},
	41
	42	"arrayController": {
	43	"module": "montage/ui/controller/array-controller",
	44	"name": "ArrayController",
	45	"bindings": {
	46	"content": {
	47	"boundObject": {"@": "owner"},
	48	"boundObjectPropertyPath": "childNodes"
	49	}
	50	}
	51	},
	52
	53	"leaf": {
	54	"module": "js/components/treeview/leaf.reel",
	55	"name": "Leaf",
	56	"bindings": {
	57	"sourceObject": {
	58	"boundObject": {"@": "repetition" },
	59	"boundObjectPropertyPath": "objectAtCurrentIteration",
	60	"oneway": true
	61	},
	62	"labelKey" : {
	63	"boundObject": {"@": "owner" },
	64	"boundObjectPropertyPath": "labelKey",
	65	"oneway": true
	66	},
	67	"branchKey" : {
	68	"boundObject": {"@": "owner" },
	69	"boundObjectPropertyPath": "branchKey",
	70	"oneway": true
	71	},
	72	"treeView" : {
	73	"boundObject": {"@": "owner" },
	74	"boundObjectPropertyPath": "treeView",
	75	"oneway": true
	76	}
	77	}
	78	},
	79
	80	"branch": {
	81	"module": "js/components/treeview/branch.reel",
	82	"name": "Branch",
	83	"bindings": {
	84	"sourceObject": {
	85	"boundObject": {"@": "repetition" },
	86	"boundObjectPropertyPath": "objectAtCurrentIteration",
	87	"oneway": true
	88	},
	89	"labelKey" : {
	90	"boundObject": {"@": "owner" },
	91	"boundObjectPropertyPath": "labelKey",
	92	"oneway": true
	93	},
	94	"branchKey" : {
	95	"boundObject": {"@": "owner" },
	96	"boundObjectPropertyPath": "branchKey",
	97	"oneway": true
	98	},
	99	"treeView" : {
	100	"boundObject": {"@": "owner" },
	101	"boundObjectPropertyPath": "treeView",
	102	"oneway": true
	103	}
	104	}
	105	},
	106
	107	"repetition": {
	108	"module": "montage/ui/repetition.reel",
	109	"name": "Repetition",
	110	"properties": {
	111	"element": { "#": "branchList" },
	112	"contentController": {"@": "arrayController" }
	113	}
	114	},
	115
	116	"substitution": {
	117	"module": "montage/ui/substitution.reel",
	118	"name": "Substitution",
	119	"properties": {
	120	"element": {"#": "treeItem"},
	121	"switchComponents": {
	122	"leaf": {"@": "leaf"},
	123	"branch": {"@": "branch"}
	124
	125	}
	126	},
	127	"bindings": {
	128	"switchValue": {
	129	"boundObject": {"@": "repetition"},
	130	"boundObjectPropertyPath": "objectAtCurrentIteration.treeNodeType",
	131	"oneway": true
	132	}
	133	}
	134	}
	135	}
	136	</script>
	137	</head>
	138	<body>
	139	<div id="branch" class="branch">
	140	<span id="label" class="branch-label"></span>
	141
	142	<ul id="branchList">
	143	<li id="treeItem"></li>
	144	</ul>
	145	</div>
	146	</body>
	147	</html> \ No newline at end of file


diff --git a/js/components/treeview/branch.reel/branch.js b/js/components/treeview/branch.reel/branch.js new file mode 100644 index 00000000..892da71a --- /dev/null +++ b/js/components/treeview/branch.reel/branch.js
@@ -0,0 +1,48 @@
	1	/* <copyright>
	2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	5	</copyright> */
	6
	7	var Montage = require("montage").Montage,
	8	Component = require("montage/ui/component").Component,
	9	TreeNode = require("js/components/treeview/tree-node").TreeNode;
	10
	11	var Branch = exports.Branch = Montage.create(TreeNode, {
	12	hasTemplate:{
	13	value:true
	14	},
	15	repetition:{
	16	value: null
	17	},
	18	prepareForDraw : {
	19	value: function() {
	20	t