diff options
author | Jon Reid | 2012-04-30 17:34:11 -0700 |
---|---|---|
committer | Jon Reid | 2012-04-30 17:34:11 -0700 |
commit | d917e865cbc7fd8929e068aeba967af1bd64c5e7 (patch) | |
tree | 7ea76b04f74b29c27f4dd7b642357672a1731e02 /js/panels/Timeline | |
parent | a8ad82e6595b75838305eb4fa83385a42053ffd6 (diff) | |
download | ninja-d917e865cbc7fd8929e068aeba967af1bd64c5e7.tar.gz |
Timeline: bug fix: disable bread crumb setlevel.
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 1 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 0fb91634..b23da749 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -558,6 +558,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
558 | }, | 558 | }, |
559 | didDraw: { | 559 | didDraw: { |
560 | value: function() { | 560 | value: function() { |
561 | // console.log("Layer.didDraw: Layer "+ this.layerID ); | ||
561 | if (this._isFirstDraw === true) { | 562 | if (this._isFirstDraw === true) { |
562 | if (this.isSelected === true) { | 563 | if (this.isSelected === true) { |
563 | if (this.application.ninja.currentDocument._uuid === this._docUUID) { | 564 | if (this.application.ninja.currentDocument._uuid === this._docUUID) { |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 64303cef..6e64cde0 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -705,7 +705,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
705 | // there is a currentDocument. We don't do anything at that time. | 705 | // there is a currentDocument. We don't do anything at that time. |
706 | return; | 706 | return; |
707 | } | 707 | } |
708 | this.application.ninja.currentDocument.setLevel = true; | 708 | // this.application.ninja.currentDocument.setLevel = true; |
709 | this._boolCacheArrays = false; | 709 | this._boolCacheArrays = false; |
710 | this.clearTimelinePanel(); | 710 | this.clearTimelinePanel(); |
711 | this._boolCacheArrays = true; | 711 | this._boolCacheArrays = true; |