Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/controllers/styles-controller.js

9 files changed, 601 insertions, 646 deletions

diff --git a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
index 3eae3ea3..b957d495 100755
--- a/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
+++ b/js/panels/Color/colorpanelpopup.reel/colorpanelpopup.js
@@ -405,7 +405,7 @@ exports.ColorPanelPopup = Montage.create(Component, {
     //
     defaultGradient: {
         enumerable: true,
-        value: {mode: 'linear', stops: [{mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}, position: 0}, {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}, position: 100}]}
+        value: {mode: 'linear', gradientMode: 'linear', stops: [{mode: 'rgb', value: {r: 255, g: 255, b: 255, a: 1, css: 'rgb(255, 255, 255)'}, position: 0}, {mode: 'rgb', value: {r: 0, g: 0, b: 0, a: 1, css: 'rgb(0, 0, 0)'}, position: 100}]}
     },
     ////////////////////////////////////////////////////////////////////
     //
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 81bd1867..b41680be 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -38,13 +38,11 @@ var Layer = exports.Layer = Montage.create(Component, {
     _arrLayerStyles : {
         serializable: true,
                 enumerable: true,
-        serializable: true,
             value: []
     },
     arrLayerStyles : {
         serializable: true,
         enumerable: true,
-        serializable: true,
         get: function() {
                 return this._arrLayerStyles;
         },
@@ -84,8 +82,8 @@ var Layer = exports.Layer = Montage.create(Component, {
                 if (newVal !== this._layerName) {
                         this._layerEditable.value = newVal;
                         this._layerName = newVal;
-                        this._layerEditable.needsDraw = true;
-                        this.needsDraw = true;
+                        this.layerData.layerName = newVal;
+                        this.log('layerName setter: ' + newVal)
                 }
                 
         }
@@ -110,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     /* Position and Transform hottext values */
     _dtextPositionX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextPositionX:{
@@ -121,7 +119,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextPositionX !== value) {
                         this._dtextPositionX = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -129,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextPositionY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextPositionY:{
@@ -140,7 +138,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextPositionY !== value) {
                         this._dtextPositionY = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -148,7 +146,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextScaleX:{
@@ -159,7 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextScaleX !== value) {
                         this._dtextScaleX = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -167,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextScaleY:{
@@ -178,7 +176,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextScaleY !== value) {
                         this._dtextScaleY = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -186,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewX : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextSkewX:{
@@ -197,7 +195,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextSkewX !== value) {
                         this._dtextSkewX = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -205,7 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewY : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextSkewY:{
@@ -216,7 +214,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextSkewY !== value) {
                         this._dtextSkewY = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -224,7 +222,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextRotate : {
         value:null,
-        serializable: true,
+        serializable: true
     },
 
     dtextRotate:{
@@ -235,7 +233,7 @@ var Layer = exports.Layer = Montage.create(Component, {
         set:function(value){
                 if (this._dtextRotate !== value) {
                         this._dtextRotate = value;
-                        this.needsDraw = true;
+                        //this.needsDraw = true;
                 }
             
         }
@@ -261,7 +259,8 @@ var Layer = exports.Layer = Montage.create(Component, {
                                 this.selectStyle(false);
                         }
                         this._isSelected = value;
-                        this.needsDraw = true;
+                        this.layerData.isSelected = value;