diff options
Diffstat (limited to 'js/panels/Timeline')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 4 | ||||
| -rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 | ||||
| -rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index 10334b31..9288d718 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
| @@ -17,14 +17,12 @@ | |||
| 17 | "styleRepetition" : {"@":"repetition1"}, | 17 | "styleRepetition" : {"@":"repetition1"}, |
| 18 | "dynamicLayerName" : {"@":"dtext1"}, | 18 | "dynamicLayerName" : {"@":"dtext1"}, |
| 19 | "dynamicLayerTag" : {"@": "dtext2"}, | 19 | "dynamicLayerTag" : {"@": "dtext2"}, |
| 20 | "slotStyle" : {"@":"slot1"}, | ||
| 21 | "mainCollapser" : {"@" : "mainCollapser"}, | 20 | "mainCollapser" : {"@" : "mainCollapser"}, |
| 22 | "positionCollapser" : {"@" : "positionCollapser"}, | 21 | "positionCollapser" : {"@" : "positionCollapser"}, |
| 23 | "transformCollapser" : {"@" : "transformCollapser"}, | 22 | "transformCollapser" : {"@" : "transformCollapser"}, |
| 24 | "styleCollapser" : {"@" : "styleCollapser"}, | 23 | "styleCollapser" : {"@" : "styleCollapser"}, |
| 25 | "clickerMain" : {"#" : "clicker-main"}, | 24 | "clickerMain" : {"#" : "clicker-main"}, |
| 26 | "myLabel" : {"#" : "myLabel"}, | 25 | "myLabel" : {"#" : "myLabel"} |
| 27 | "dragDrop" : {"@" : "DragDrop"} | ||
| 28 | } | 26 | } |
| 29 | }, | 27 | }, |
| 30 | "dtext1" : { | 28 | "dtext1" : { |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 48818e44..d1cab096 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
| @@ -654,7 +654,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
| 654 | 654 | ||
| 655 | //debugger; | 655 | //debugger; |
| 656 | if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { | 656 | if (typeof(this.application.ninja.currentDocument.tlCurrentSelectedContainer) !== "undefined") { |
| 657 | this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; | 657 | // this.application.ninja.currentSelectedContainer=this.application.ninja.currentDocument.tlCurrentSelectedContainer; |
| 658 | } | 658 | } |
| 659 | 659 | ||
| 660 | // Are we only showing animated layers? | 660 | // Are we only showing animated layers? |
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html index 44ad9abb..5c5a8b76 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | "properties": { | 15 | "properties": { |
| 16 | "element": {"#": "track"}, | 16 | "element": {"#": "track"}, |
| 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, | 17 | "tweenRepetition" : {"@" : "tweenRepetition"}, |
| 18 | "styleTracksRepetition" : {"@" : "styleTracksRepetition"}, | ||
| 19 | "tween": {"@" : "tween"}, | 18 | "tween": {"@" : "tween"}, |
| 20 | "_mainCollapser" : {"@" : "mainCollapser"}, | 19 | "_mainCollapser" : {"@" : "mainCollapser"}, |
| 21 | "_positionCollapser" : {"@" : "positionCollapser"}, | 20 | "_positionCollapser" : {"@" : "positionCollapser"}, |