From f6835e48d3597ecb8cf1da8bcc91b58a8227d389 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 7 Mar 2012 11:12:57 -0800
Subject: Optimize Timeline serialization

Change all serialized properties into one big object to reduce bindings

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 41 +++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 81bd1867..df1770da 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;
     	},
@@ -386,7 +384,44 @@ var Layer = exports.Layer = Montage.create(Component, {
     		this._bypassAnimation = newVal;
     	}
     },
-    
+
+    _layerData:{
+        serializable:true,
+        value:{}
+    },
+
+    layerData:{
+        serializable:true,
+        get:function(){
+            return this._layerData;
+        },
+        set:function(val){
+            this._layerData = val;
+            this.setData();
+        }
+    },
+
+    setData:{
+        value:function(){
+            this.layerName = this.layerData.layerName;
+            this.layerID = this.layerData.layerID;
+            this.arrLayerStyles = this.layerData.arrLayerStyles;
+            this.isMainCollapsed = this.layerData.isMainCollapsed;
+            this.isPositionCollapsed = this.layerData.isPositionCollapsed;
+            this.isTransformCollapsed = this.layerData.isTransformCollapsed;
+            this.isSelected = this.layerData.isSelected;
+            this.isActive = this.layerData.isActive;
+            this.isStyleCollapsed = this.layerData.isStyleCollapsed;
+            this.bypassAnimation = this.layerData.bypassAnimation;
+            this.dtextPositionX = this.layerData.dtextPositionX;
+            this.dtextPositionY = this.layerData.dtextPositionY;
+            this.dtextSkewX = this.layerData.dtextSkewX;
+            this.dtextSkewY = this.layerData.dtextSkewY;
+            this.dtextScaleX = this.layerData.dtextScaleX;
+            this.dtextScaleY = this.layerData.dtextScaleY;
+            this.dtextRotate = this.layerData.dtextRotate;
+        }
+    },
 
 	/* END: Models */
 
-- 
cgit v1.2.3


From a1fd19bff814afa2f4a0299f860055b1e338cf3d Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 7 Mar 2012 11:32:37 -0800
Subject: Bugfixes from optimization

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index df1770da..0500ec11 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -108,7 +108,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     /* Position and Transform hottext values */
     _dtextPositionX : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextPositionX:{
@@ -127,7 +127,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextPositionY : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextPositionY:{
@@ -146,7 +146,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleX : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextScaleX:{
@@ -165,7 +165,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextScaleY : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextScaleY:{
@@ -184,7 +184,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewX : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextSkewX:{
@@ -203,7 +203,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextSkewY : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextSkewY:{
@@ -222,7 +222,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     
     _dtextRotate : {
         value:null,
-    	serializable: true,
+    	serializable: true
     },
 
     dtextRotate:{
@@ -397,7 +397,9 @@ var Layer = exports.Layer = Montage.create(Component, {
         },
         set:function(val){
             this._layerData = val;
-            this.setData();
+            if(this._layerData){
+                this.setData();
+            }
         }
     },
 
-- 
cgit v1.2.3


From abdd0542bce89b6b22f0684d00b9cf24e5d0a5e6 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Wed, 7 Mar 2012 13:43:41 -0800
Subject: cleanup

Signed-off-by: Jonathan Duran <jduran@motorola.com>
---
 js/panels/Timeline/Layer.reel/Layer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/panels/Timeline/Layer.reel/Layer.js')

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index 0500ec11..d65d031f 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -665,7 +665,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 	},
 	handleMousedown: {
 		value: function(event) {
-			this.isActive = true;
+			this.layerData.isActive = true;
 			var ptrParent = nj.queryParentSelector(event.target, ".content-style");
 			if (ptrParent !== false) {
 				this.selectStyle(this.getActiveStyleIndex());
-- 
cgit v1.2.3