From ec5f81c6c0ccf865505ab82ebf9240c667f05c91 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Mon, 27 Feb 2012 12:07:30 -0800
Subject: Timeline: further work on clearTimeline method.
---
.../Timeline/TimelinePanel.reel/TimelinePanel.html | 5 +++--
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 18 ++++++++++++++----
2 files changed, 17 insertions(+), 6 deletions(-)
(limited to 'js/panels/Timeline/TimelinePanel.reel')
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 9d0b8210..65d2fa7b 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -32,7 +32,8 @@
"timetext" : {"#": "time_text"},
"timebar" : {"#": "time_bar"},
"container_tracks" : {"#" : "container-tracks"},
- "end_hottext" : {"@" : "endHottext"}
+ "end_hottext" : {"@" : "endHottext"},
+ "getme" : {"#" : "getme"}
}
},
@@ -284,7 +285,7 @@
-
Master Layer
+
Master Layer
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 2143dafd..9519730e 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -172,6 +172,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
prepareForDraw:{
value:function () {
this.eventManager.addEventListener( "onOpenDocument", this, false);
+ var that = this;
+ this.getme.addEventListener("click", function() {
+ that.clearTimelinePanel();
+ }, false)
}
},
@@ -246,11 +250,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
clearTimelinePanel : {
value: function() {
console.log('clearing timeline...')
- this.arrTracks = null;
- this.arrLayers = null;
+ // update playhead position and time text
+ this.application.ninja.timeline.playhead.style.left = "-2px";
+ this.application.ninja.timeline.playheadmarker.style.left = "0px";
+ this.application.ninja.timeline.updateTimeText(0.00);
+ this.timebar.style.width = "0px";
+
+ this.arrTracks = [];
+ this.arrLayers = [];
this.currentLayerNumber = 0;
- this.currentLayerSelected = null;
- this.currentTrackSelected = null;
+ this.currentLayerSelected = false;
+ this.currentTrackSelected = false;
this.selectedKeyframes = [];
this.selectedTweens = [];
this._captureSelection = false;
--
cgit v1.2.3