aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/Style.reel/Style.js
diff options
context:
space:
mode:
authorJon Reid2012-07-09 14:53:00 -0700
committerJon Reid2012-07-09 14:53:00 -0700
commit65a9d88691a9f10130ebd853492dab0d59f4aa53 (patch)
tree0bbb855eadc71c09a1118a22f275f01b735f2ac5 /js/panels/Timeline/Style.reel/Style.js
parentd2ae0619d673e66d59d7a0584fc14d420511dcdf (diff)
parentd874dda445a3baa2dd24b9554b6fc7f620dd5e89 (diff)
downloadninja-65a9d88691a9f10130ebd853492dab0d59f4aa53.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/panels/Timeline/Style.reel/Style.js')
-rw-r--r--js/panels/Timeline/Style.reel/Style.js7
1 files changed, 0 insertions, 7 deletions
diff --git a/js/panels/Timeline/Style.reel/Style.js b/js/panels/Timeline/Style.reel/Style.js
index e1c08d2d..dc159a01 100644
--- a/js/panels/Timeline/Style.reel/Style.js
+++ b/js/panels/Timeline/Style.reel/Style.js
@@ -457,12 +457,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
457 var tweenable = {}, 457 var tweenable = {},
458 i = 0; 458 i = 0;
459 459
460 if (this.ruleTweener === true) {
461 return;
462 } else {
463 this.ruleTweener = true;
464 }
465
466 tweenable.tweener = "input"; 460 tweenable.tweener = "input";
467 461
468 for (i = 0; i < this._myTweenables.length; i++) { 462 for (i = 0; i < this._myTweenables.length; i++) {
@@ -499,7 +493,6 @@ var LayerStyle = exports.LayerStyle = Montage.create(Component, {
499 this._borderSide = tweenable.strokePosition 493 this._borderSide = tweenable.strokePosition
500 } 494 }
501 } 495 }
502
503 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) { 496 if (this.addedColorChips === false && this.application.ninja.colorController.colorPanelDrawn) {
504 // setup fill color 497 // setup fill color
505 this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 }; 498 this._fillColorCtrl.props = { side: 'top', align: 'center', wheel: true, palette: true, gradient: false, image: false, nocolor: true, offset: -80 };