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-leaf.reel
parent: aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent: 10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
download: ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz
3 files changed, 112 insertions, 0 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
new file mode 100644
index 00000000..b2f427b5
--- /dev/null
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -0,0 +1,28 @@
+/* <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 .leaf-label {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAIAAAD9iXMrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEQzcwMEU1RjQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEQzcwMEU2MDQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNzAwRTVENDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNzAwRTVFNDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2BUcaK3QAAANFJREFUeNqMULEOREAQdYjvuE%2FYWlSUQqKQ7A%2FsD6n0SoVCFHpRa0SllvgFlpvzZO9OcfGSnbx9M%2FNmMpp2Dw96VVX9L%2FJ93wRrmkZJIKrZcRyK%2Bs25p5%2BU8pK4KCakMAzxL4oCJIqivu8Nw0DDu25ZFtW3ritIkiS0tGVZtm1%2F6rZtu4yr67osSyJBEJx3ybKsbVukOecU4zh2XRfKMAzTNJmYpWxgPM%2BzEIIxRrzrOs%2FzdMyVvyAxTdPxAJFzv%2BeBbz8cfN93kDzPb55ZewkwAF0Ddf6ATSsHAAAAAElFTkSuQmCC);
+    background-position: 3px center;
+    background-repeat: no-repeat;
+    border-bottom: 1px solid #505050;
+    cursor: pointer;
+    padding: 3px 0 4px;
+}
+/* First level */
+.branch .leaf-label {
+    padding-left: 25px;
+}
+/* Second level */
+.branch .branch .leaf-label {
+    background-position: 25px center;
+    padding-left: 45px;
+}
+/* Third level */
+.branch .branch .branch .leaf-label {
+    background-position: 45px center;
+    padding-left: 65px;
+}
+\ No newline at end of file
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
new file mode 100644
index 00000000..bd8e8acd
--- /dev/null
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
@@ -0,0 +1,43 @@
+<!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-leaf.css" rel="stylesheet" type="text/css" />
+        <script type="text/montage-serialization">
+        {
+            "owner": {
+                "module" : "js/components/treeview/ninja-leaf.reel",
+                "name" : "Leaf",
+                "properties" : {
+                    "element" : {"#" : "leaf"},
+                    "label" : { "@" : "textComponent" }
+                }
+            },
+            "textComponent" : {
+                "module" : "montage/ui/dynamic-text.reel",
+                "name" : "DynamicText",
+                "properties" : {
+                    "element" : { "#" : "label" }
+                },
+                "bindings" : {
+                    "value" : {
+                        "boundObject" : {"@": "owner"},
+                        "boundObjectPropertyPath": "_labelText",
+                        "oneway": true
+                    }
+                }
+            }
+        }
+                </script>
+</head>
+<body>
+    <div id="leaf" class="leaf">
+        <div id="label" class="leaf-label"></div>
+    </div>
+</body>
+</html>
+\ No newline at end of file
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
new file mode 100644
index 00000000..bd566b26
--- /dev/null
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -0,0 +1,41 @@
+/* <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/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+    TreeNode = require("js/components/treeview/tree-node").TreeNode;
+exports.Leaf = Montage.create(TreeNode, {
+    hasTemplate: {
+        value: true
+    },
+    templateDidLoad : {
+        value: function() {
+            this.needsDraw = true;
+        }
+    },
+    prepareForDraw: {
+        value : function() {
+            this.activationEvent = this.activationEvent || 'click';
+            this.label._element.addEventListener(this.activationEvent, this.handleNodeActivation.bind(this), false);
+        }
+    },
+    handleNodeActivation: {
+        value: function(e) {
+            console.log(this.sourceObject);
+            this.treeView.contentController.delegate.applyPresetSelection(this.sourceObject);
+        }
+    },
+    draw : {
+        value : function() {
+            if(this.sourceObject[this.labelKey]) {
+                this._labelText = this.sourceObject[this.labelKey];
+            }
+        }
+    }
+});
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-leaf.reel
parent	aa01c1210f3a4d9fd55a771b9de2c58ee3fa4bb6 (diff)
parent	10cdeb52403f16d5d4be43a516e8cdfbc866a2a2 (diff)
download	ninja-9b45b897949bf934c8bf2c90ee2ff78f8713cb12.tar.gz

diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css new file mode 100644 index 00000000..b2f427b5 --- /dev/null +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -0,0 +1,28 @@
	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 .leaf-label {
	8	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA0AAAANCAIAAAD9iXMrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw%2FeHBhY2tldCBiZWdpbj0i77u%2FIiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8%2BIDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIE1hY2ludG9zaCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpEQzcwMEU1RjQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpEQzcwMEU2MDQxM0MxMUUxQUM0MERBNzM1MUVEMUQxMCI%2BIDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkRDNzAwRTVENDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkRDNzAwRTVFNDEzQzExRTFBQzQwREE3MzUxRUQxRDEwIi8%2BIDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY%2BIDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8%2BUcaK3QAAANFJREFUeNqMULEOREAQdYjvuE%2FYWlSUQqKQ7A%2FsD6n0SoVCFHpRa0SllvgFlpvzZO9OcfGSnbx9M%2FNmMpp2Dw96VVX9L%2FJ93wRrmkZJIKrZcRyK%2Bs25p5%2BU8pK4KCakMAzxL4oCJIqivu8Nw0DDu25ZFtW3ritIkiS0tGVZtm1%2F6rZtu4yr67osSyJBEJx3ybKsbVukOecU4zh2XRfKMAzTNJmYpWxgPM%2BzEIIxRrzrOs%2FzdMyVvyAxTdPxAJFzv%2BeBbz8cfN93kDzPb55ZewkwAF0Ddf6ATSsHAAAAAElFTkSuQmCC);
	9	background-position: 3px center;
	10	background-repeat: no-repeat;
	11	border-bottom: 1px solid #505050;
	12	cursor: pointer;
	13	padding: 3px 0 4px;
	14	}
	15	/* First level */
	16	.branch .leaf-label {
	17	padding-left: 25px;
	18	}
	19	/* Second level */
	20	.branch .branch .leaf-label {
	21	background-position: 25px center;
	22	padding-left: 45px;
	23	}
	24	/* Third level */
	25	.branch .branch .branch .leaf-label {
	26	background-position: 45px center;
	27	padding-left: 65px;
	28	} \ No newline at end of file


diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html new file mode 100644 index 00000000..bd8e8acd --- /dev/null +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html
@@ -0,0 +1,43 @@
	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-leaf.css" rel="stylesheet" type="text/css" />
	11	<script type="text/montage-serialization">
	12	{
	13	"owner": {
	14	"module" : "js/components/treeview/ninja-leaf.reel",
	15	"name" : "Leaf",
	16	"properties" : {
	17	"element" : {"#" : "leaf"},
	18	"label" : { "@" : "textComponent" }
	19	}
	20	},
	21	"textComponent" : {
	22	"module" : "montage/ui/dynamic-text.reel",
	23	"name" : "DynamicText",
	24	"properties" : {
	25	"element" : { "#" : "label" }
	26	},
	27	"bindings" : {
	28	"value" : {
	29	"boundObject" : {"@": "owner"},
	30	"boundObjectPropertyPath": "_labelText",
	31	"oneway": true
	32	}
	33	}
	34	}
	35	}
	36	</script>
	37	</head>
	38	<body>
	39	<div id="leaf" class="leaf">
	40	<div id="label" class="leaf-label"></div>
	41	</div>
	42	</body>
	43	</html> \ No newline at end of file


diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js new file mode 100644 index 00000000..bd566b26 --- /dev/null +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -0,0 +1,41 @@
	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/core/core").Montage,
	8	Component = require("montage/ui/component").Component;
	9	TreeNode = require("js/components/treeview/tree-node").TreeNode;
	10
	11	exports.Leaf = Montage.create(TreeNode, {
	12	hasTemplate: {
	13	value: true
	14	},
	15	templateDidLoad : {
	16	value: function() {
	17	this.needsDraw = true;
	18	}
	19	},
	20	prepareForDraw: {
	21	value : function() {
	22	this.activationEvent = this.activationEvent \|\| 'click';
	23	this.label._element.addEventListener(this.activationEvent, this.handleNodeActivation.bind(this), false);
	24	}
	25	},
	26	handleNodeActivation: {
	27	value: function(e) {
	28	console.log(this.sourceObject);
	29	this.treeView.contentController.delegate.applyPresetSelection(this.sourceObject);
	30	}
	31	},
	32	draw : {
	33	value : function() {
	34	if(this.sourceObject[this.labelKey]) {
	35	this._labelText = this.sourceObject[this.labelKey];
	36	}
	37	}
	38	}
	39
	40
	41	});