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

1 files changed, 48 insertions, 0 deletions

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() {
+            this.label._element.addEventListener('click', this, false);
+
+            this.treeView.contentController.addBranchController(this.arrayController);
+        }
+    },
+    draw:{
+        value: function () {
+
+            if (this.sourceObject[this.labelKey]) {
+                this._labelText = this.sourceObject[this.labelKey];
+            } else {
+                console.log("Label key unknown");
+            }
+
+        }
+    },
+    handleClick : {
+        value: function(e) {
+            e.preventDefault();
+            this.toggleExpand();
+
+        }
+    },
+    collapseClass : {
+        value: 'collapse'
+    }
+
+
+});