Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes

Conflicts:
	js/panels/properties.reel/sections/position-size.reel/position-size.html

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

2 files changed, 34 insertions, 7 deletions

diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 1bed0f0b..9ab575c6 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "prototype" : "js/components/treeview/leaf.reel"                
             },
             "scrollview": {
-                "prototype": "montage/ui/scrollview.reel[Scrollview]",
+                "prototype": "montage/ui/scroller.reel",
                 "properties": {
                     "element": {"#": "treeView"},
                     "axis": "vertical"
diff --git a/js/components/treeview/treeview.reel/treeview.js b/js/components/treeview/treeview.reel/treeview.js
index 9f78d36d..81dacbca 100644
--- a/js/components/treeview/treeview.reel/treeview.js
+++ b/js/components/treeview/treeview.reel/treeview.js
@@ -13,18 +13,43 @@ exports.Treeview = Montage.create(Component, {
     data              : { value : null },
     rootBranch        : { value : null },
 
+    activationEvent: {
+        value: null
+//        serializable: true
+    },
+
     _hasBeenDeserialized: {
-        value: false,
-        enumerable: false
+        value: false
+//        enumerable: false
     },
 
     branchComponent : {
-        value: null,
-        serializable: true
+        value: null
+//        serializable: true
     },
     leafComponent : {
-        value: null,
-        serializable: true
+        value: null
+//        serializable: true
+    },
+
+    defaultBranchComponent: {
+        value: null
+//        serializable: true
+    },
+
+    defaultLeafComponent: {
+        value: null
+//        serializable: true
+    },
+
+    scrollview: {
+        value: null
+//        serializable: true
+    },
+
+    slot: {
+        value: null
+//        serializable: true
     },
 
     hasTemplate: {
@@ -63,6 +88,7 @@ exports.Treeview = Montage.create(Component, {
     },
     showRoot : {
         value: null
+//        serializable: true
     },
 
     _contentController: {
@@ -110,6 +136,7 @@ exports.Treeview = Montage.create(Component, {
             }
 
         }
+//        serializable: true
     },
 
     deserializedFromTemplate: {