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