Merge branch 'refs/heads/Ninja-Internal' into Color

51 files changed, 872 insertions, 194 deletions

diff --git a/js/components/SliderBase.js b/js/components/SliderBase.js
index 8df868a2..a6c3ff6d 100755
--- a/js/components/SliderBase.js
+++ b/js/components/SliderBase.js
@@ -83,7 +83,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 
     // Internal flags to determine what the change/changing events will contain
@@ -153,7 +154,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 
     _maxValue: {
@@ -175,7 +177,8 @@ var SliderBase = exports.SliderBase = Montage.create(Component, {
                 }
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 
     _valueCoef: {
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index bc433f52..29f49b7b 100755
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -20,7 +20,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     labelField: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     labelFunction: {
@@ -28,7 +29,8 @@ exports.Combobox = Montage.create(Component, {
     },
 
     dataField: {
-        value: null
+        value: null,
+        serializable: true
     },
 
     dataFunction: {
diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index cb95ca1d..bc3d0860 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -30,7 +30,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
         },
         set: function(value) {
             this._delegate = value;
-        }
+        },
+        serializable: true
     },
 
     rootKey : {
@@ -38,7 +39,13 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
     },
 
     branchKey : {
-        value: null
+        value: null,
+        serializable: true
+    },
+
+    labelKey: {
+        value: null,
+        serializable: true
     },
 
     _root : {
diff --git a/js/components/hottext.reel/hottext.js b/js/components/hottext.reel/hottext.js
index 0480597a..93e6e745 100755
--- a/js/components/hottext.reel/hottext.js
+++ b/js/components/hottext.reel/hottext.js
@@ -121,13 +121,19 @@ var HotText = exports.HotText = Montage.create(SliderBase, {
         value: 2000
     },
 
+    // Flag used to dispatch a single change event if either or both of value and units are changed
+    _unitsModified: {
+        enumerable: false,
+        value: false
+    },
+
     value: {
         serializable: true,
         enumerable: true,
         get: function() {
             return this._value;
         },
-        set: function(value, fromInput) {
+        set: function(value) {
             if (isNaN(value)) {
                 this._valueSyncedWithInputField = false;
                 this.needsDraw = true;
@@ -149,6 +155,9 @@ var HotText = exports.HotText = Montage.create(SliderBase, {
                 this._valueSyncedWithInputField = false;
                 this.needsDraw = true;
                 this._dispatchActionEvent();
+            } else if(this._unitsModified) {
+                // Need to dispatch change event if units changed
+                this._dispatchActionEvent();
             }
         }
     },
@@ -164,7 +173,7 @@ var HotText = exports.HotText = Montage.create(SliderBase, {
         enumerable: false,
         value: function() {
             this._setEventFlags("change", false);