aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-03-30 12:16:40 -0700
committerJon Reid2012-03-30 12:16:40 -0700
commit18143071c9e1308d6cb9289477563aea22856c5e (patch)
tree79f0932dce77fc77c3ca1cc824758e57d66ec4bf /js
parent7bcc6c6873778a19afb5b7f77e5b7e2e8deedd94 (diff)
downloadninja-18143071c9e1308d6cb9289477563aea22856c5e.tar.gz
Timeline: Bug fixes.
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/Layer.reel/Layer.js2
-rw-r--r--js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index c69f28b0..f1882985 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -385,7 +385,7 @@ var Layer = exports.Layer = Montage.create(Component, {
385 return this._bypassAnimation; 385 return this._bypassAnimation;
386 }, 386 },
387 set: function(newVal) { 387 set: function(newVal) {
388 if (newVal !== this._bypassAnimation) { 388 if ((newVal !== this._bypassAnimation) && (typeof(this.layerData) !== "undefined")) {
389 this._bypassAnimation = newVal; 389 this._bypassAnimation = newVal;
390 this.layerData.bypassAnimation = newVal; 390 this.layerData.bypassAnimation = newVal;
391 } 391 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 978b239f..e294a69e 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -100,7 +100,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
100 return this._bypassAnimation; 100 return this._bypassAnimation;
101 }, 101 },
102 set: function(newVal) { 102 set: function(newVal) {
103 if (newVal !== this._bypassAnimation) { 103 if ((newVal !== this._bypassAnimation) && (typeof(this.trackData) !== "undefined")) {
104 this._bypassAnimation = newVal; 104 this._bypassAnimation = newVal;
105 this.trackData.bypassAnimation = newVal; 105 this.trackData.bypassAnimation = newVal;
106 } 106 }