From 390e5f7e3ba41ef0c71d1f944d926f9eee0c8846 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 26 Jun 2012 12:34:30 -0700
Subject: Timeline: Bug fix IKNINJA-1816

---
 js/panels/Timeline/Layer.reel/Layer.js | 5 +++++
 1 file changed, 5 insertions(+)

(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 776d5ec8..a8c22b2a 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -945,12 +945,14 @@ var Layer = exports.Layer = Montage.create(Component, {
 				this.isMainCollapsed = false;
 			} else {
 				this.isMainCollapsed = true;
+				this.application.ninja.timeline.synchScrollbars(43);
 			}
 			this.triggerOutgoingBinding();
 		}
 	},
 	handlePositionCollapserClick : {
 		value: function(event) {
+			var myHeight = this.positionCollapser.element.offsetHeight;
 			this.positionCollapser.bypassAnimation = false;
 			this.bypassAnimation = false;
 			this.layerData.bypassAnimation = false;
@@ -958,12 +960,14 @@ var Layer = exports.Layer = Montage.create(Component, {
 				this.isPositionCollapsed = false;
 			} else {
 				this.isPositionCollapsed = true;
+				this.application.ninja.timeline.synchScrollbars(myHeight);
 			}
 			this.triggerOutgoingBinding();
 		}
 	},
 	handleStyleCollapserClick : {
 		value: function(event) {
+			var myHeight = this.styleCollapser.element.offsetHeight;
 			this.styleCollapser.bypassAnimation = false;
 			this.bypassAnimation = false;
 			this.layerData.bypassAnimation = false;
@@ -971,6 +975,7 @@ var Layer = exports.Layer = Montage.create(Component, {
 				this.isStyleCollapsed = false;
 			} else {
 				this.isStyleCollapsed = true;
+				this.application.ninja.timeline.synchScrollbars(myHeight);
 			}
 			this.triggerOutgoingBinding();
 		}
-- 
cgit v1.2.3


From 9aa987003f0c7866e66aabcc7d9cc2b9da8ed91c Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Tue, 26 Jun 2012 13:49:03 -0700
Subject: Timeline: Bug fix: Indexing on styles when loading files.

---
 js/panels/Timeline/Layer.reel/Layer.js | 14 +++++++++++---
 1 file changed, 11 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 a8c22b2a..2deb20da 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -752,12 +752,20 @@ var Layer = exports.Layer = Montage.create(Component, {
 			//defaultEventManager.dispatchEvent(newEvent);
 			
 			// Dispatch the event to the TimelineTrack component associated with this Layer.
-			var myIndex = this.application.ninja.timeline.getActiveLayerIndex(),
+			var myIndex = false,
+				i = 0, 
+				arrLayersLength = this.parentComponent.parentComponent.arrLayers.length,
 				arrTracks = document.querySelectorAll('[data-montage-id="track"]');
-
+			
+			for (i = 0; i < arrLayersLength; i++) {
+				if (this.stageElement == this.parentComponent.parentComponent.arrLayers[i].layerData.stageElement) {
+					myIndex = i;
+				}
+			}
+			
 			if (myIndex !== false) {
 				arrTracks[myIndex].dispatchEvent(newEvent);
-			}
+			} 
 		}
 	},
 
-- 
cgit v1.2.3


From bdeedb6c37212b4991b5f492ce665361997dd8e6 Mon Sep 17 00:00:00 2001
From: Jonathan Duran
Date: Tue, 26 Jun 2012 16:52:08 -0700
Subject: Fix missing serialization in Layer.js

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

(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 2deb20da..b4833fa2 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -325,6 +325,7 @@ var Layer = exports.Layer = Montage.create(Component, {
     	value: false
     },
     isActive: {
+        serializable:true,
     	get: function() {
     		return this._isActive;
     	},
-- 
cgit v1.2.3