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, 44 insertions, 0 deletions

diff --git a/js/components/treeview/leaf.reel/leaf.js b/js/components/treeview/leaf.reel/leaf.js
new file mode 100644
index 00000000..3a63f5ed
--- /dev/null
+++ b/js/components/treeview/leaf.reel/leaf.js
@@ -0,0 +1,44 @@
+/* <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
+    },
+    deserializedFromTemplate : {
+        value: function() {
+            //console.log('Leaf deserialized.');
+        }
+    },
+    templateDidLoad : {
+        value: function() {
+            //debugger;
+            console.log('Leaf\'s template did load.');
+            this.needsDraw = true;
+        }
+    },
+    prepareForDraw: {
+        value : function() {
+            console.log('Leafs prepare for draw.', this.labelKey);
+        }
+    },
+    draw : {
+        value : function() {
+            if(this.sourceObject[this.labelKey]) {
+                this._labelText = this.sourceObject[this.labelKey];
+            } else {
+                console.log("Label key unknown");
+            }
+
+        }
+    }
+
+
+});