aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Layer.reel/Layer.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-05 14:35:37 -0800
committerPushkar Joshi2012-03-05 14:35:37 -0800
commitc155cd238b6f9e0b8191e0fc533f7bc974b762c2 (patch)
tree645c056432ade1d7cfe4ae2f358e068dd883d598 /js/panels/Timeline/Layer.reel/Layer.js
parentdc3c813320c8d3fb837d5d18e70ab35a53b116c1 (diff)
parent13f52cf0c74f53a919fa864f86669e8155f82961 (diff)
downloadninja-c155cd238b6f9e0b8191e0fc533f7bc974b762c2.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.js')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js22
1 files changed, 11 insertions, 11 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index e3897bbf..e76b8cc0 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -403,7 +403,7 @@ var Layer = exports.Layer = Montage.create(Component, {
403 this.mainCollapser.myContent = this.myContent; 403 this.mainCollapser.myContent = this.myContent;
404 this.mainCollapser.contentHeight = 60; 404 this.mainCollapser.contentHeight = 60;
405 this.myContent.style.height = "0px"; 405 this.myContent.style.height = "0px";
406 this.mainCollapser.element = this.element; 406 this.mainCollapser.element = this.myContent;
407 //this.mainCollapser.isCollapsedAtStart = true; 407 //this.mainCollapser.isCollapsedAtStart = true;
408 this.mainCollapser.isCollapsed = this.isMainCollapsed; 408 this.mainCollapser.isCollapsed = this.isMainCollapsed;
409 this.mainCollapser.isAnimated = true; 409 this.mainCollapser.isAnimated = true;
@@ -418,12 +418,12 @@ var Layer = exports.Layer = Montage.create(Component, {
418 defaultEventManager.dispatchEvent(newEvent); 418 defaultEventManager.dispatchEvent(newEvent);
419 that.isMainCollapsed = that.mainCollapser.isCollapsed; 419 that.isMainCollapsed = that.mainCollapser.isCollapsed;
420 } 420 }
421 this.mainCollapser.needsDraw = true; 421 //this.mainCollapser.needsDraw = true;
422 422
423 this.positionCollapser.clicker = this.clickerPosition; 423 this.positionCollapser.clicker = this.clickerPosition;
424 this.positionCollapser.myContent = this.contentPosition; 424 this.positionCollapser.myContent = this.contentPosition;
425 this.positionCollapser.element = this.element; 425 this.positionCollapser.element = this.contentPosition;
426 this.positionCollapser.contentHeight = 60; 426 this.positionCollapser.contentHeight = 40;
427 // this.positionCollapser.isCollapsedAtStart = true; 427 // this.positionCollapser.isCollapsedAtStart = true;
428 this.positionCollapser.isCollapsed = this.isPositionCollapsed; 428 this.positionCollapser.isCollapsed = this.isPositionCollapsed;
429 this.positionCollapser.isAnimated = true; 429 this.positionCollapser.isAnimated = true;
@@ -437,11 +437,11 @@ var Layer = exports.Layer = Montage.create(Component, {
437 defaultEventManager.dispatchEvent(newEvent); 437 defaultEventManager.dispatchEvent(newEvent);
438 that.isPositionCollapsed = that.positionCollapser.isCollapsed; 438 that.isPositionCollapsed = that.positionCollapser.isCollapsed;
439 } 439 }
440 this.positionCollapser.needsDraw = true; 440 //this.positionCollapser.needsDraw = true;
441 441
442 this.transformCollapser.clicker = this.clickerTransform; 442 this.transformCollapser.clicker = this.clickerTransform;
443 this.transformCollapser.myContent = this.contentTransform; 443 this.transformCollapser.myContent = this.contentTransform;
444 this.transformCollapser.element = this.element; 444 this.transformCollapser.element = this.contentTransform;
445 this.transformCollapser.contentHeight = 100; 445 this.transformCollapser.contentHeight = 100;
446 // this.transformCollapser.isCollapsedAtStart = true; 446 // this.transformCollapser.isCollapsedAtStart = true;
447 this.transformCollapser.isCollapsed = this.isTransformCollapsed; 447 this.transformCollapser.isCollapsed = this.isTransformCollapsed;
@@ -456,13 +456,13 @@ var Layer = exports.Layer = Montage.create(Component, {
456 defaultEventManager.dispatchEvent(newEvent); 456 defaultEventManager.dispatchEvent(newEvent);
457 that.isTransformCollapsed = that.transformCollapser.isCollapsed; 457 that.isTransformCollapsed = that.transformCollapser.isCollapsed;
458 } 458 }
459 this.transformCollapser.needsDraw = true; 459 //this.transformCollapser.needsDraw = true;
460 460
461 this.styleCollapser.clicker = this.clickerStyle; 461 this.styleCollapser.clicker = this.clickerStyle;
462 this.styleCollapser.myContent = this.contentStyle; 462 this.styleCollapser.myContent = this.contentStyle;
463 this.styleCollapser.element = this.element; 463 this.styleCollapser.element = this.contentStyle;
464 this.styleCollapser.isCollapsed = this.isStyleCollapsed; 464 this.styleCollapser.isCollapsed = this.isStyleCollapsed;
465 this.styleCollapser.contentHeight = 20; 465 this.styleCollapser.contentHeight = 0;
466 this.styleCollapser.isAnimated = true; 466 this.styleCollapser.isAnimated = true;
467 this.styleCollapser.labelClickEvent = function(boolBypass) { 467 this.styleCollapser.labelClickEvent = function(boolBypass) {
468 var newEvent = document.createEvent("CustomEvent"); 468 var newEvent = document.createEvent("CustomEvent");
@@ -474,7 +474,7 @@ var Layer = exports.Layer = Montage.create(Component, {
474 defaultEventManager.dispatchEvent(newEvent); 474 defaultEventManager.dispatchEvent(newEvent);
475 that.isStyleCollapsed = that.styleCollapser.isCollapsed; 475 that.isStyleCollapsed = that.styleCollapser.isCollapsed;
476 } 476 }
477 this.styleCollapser.needsDraw = true; 477 //this.styleCollapser.needsDraw = true;
478 478
479 // Add event listeners to add and delete style buttons 479 // Add event listeners to add and delete style buttons
480 this.buttonAddStyle.identifier = "addStyle"; 480 this.buttonAddStyle.identifier = "addStyle";
@@ -485,7 +485,7 @@ var Layer = exports.Layer = Montage.create(Component, {
485 485
486 // Add mousedown listener to set isActive 486 // Add mousedown listener to set isActive
487 this.element.addEventListener("mousedown", this, false); 487 this.element.addEventListener("mousedown", this, false);
488 //this.element.addEventListener("click", this, false); 488 this.element.addEventListener("click", this, false);
489 489
490 } 490 }
491 }, 491 },