From f14bc1ace048e46cbcb7148dbe37a5d2065a3779 Mon Sep 17 00:00:00 2001
From: Jon Reid
Date: Fri, 24 Feb 2012 17:26:08 -0800
Subject: Timeline: Add grids to property tracks. First take on clearTimeline
 method on TimelinePanel class.

---
 .../Timeline/PropertyTrack.reel/css/PropertyTrack.css |   6 +++---
 .../Timeline/PropertyTrack.reel/images/gridline.jpg   | Bin 0 -> 724 bytes
 .../PropertyTrack.reel/scss/PropertyTrack.scss        |   1 +
 .../Timeline/TimelinePanel.reel/TimelinePanel.js      |  18 ++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)
 create mode 100644 js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg

(limited to 'js/panels/Timeline')

diff --git a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
index 8e45305a..cb119a14 100644
--- a/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
+++ b/js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css
@@ -3,17 +3,17 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
-
 /* PropertyTrack.scss
  * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
  */
-/* line 13, ../scss/PropertyTrack.scss */
+/* line 19, ../scss/PropertyTrack.scss */
 .content-main .collapsible-content .timeline-track {
   height: 20px;
   border-bottom: 1px solid #505050;
+  background-image: url("../images/gridline.jpg");
 }
 
-/* line 19, ../scss/PropertyTrack.scss */
+/* line 26, ../scss/PropertyTrack.scss */
 .timeline-track .content-main {
   background-color: #474747;
 }
diff --git a/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg
new file mode 100644
index 00000000..9f451b0a
Binary files /dev/null and b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg differ
diff --git a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
index 273e3d77..c7ae6f0c 100644
--- a/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
+++ b/js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss
@@ -19,6 +19,7 @@
 .content-main .collapsible-content .timeline-track {
  	height: 20px;
 	border-bottom: 1px solid $color-menu-divider;
+    background-image: url("../images/gridline.jpg");
  }
 
 
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 5f484cdb..2143dafd 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -242,6 +242,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             _firstLayerDraw = true;
         }
     },
+    
+    clearTimelinePanel : {
+    	value: function() {
+    		console.log('clearing timeline...')
+    		this.arrTracks = null;
+    		this.arrLayers = null;
+    		this.currentLayerNumber = 0;
+    		this.currentLayerSelected = null;
+    		this.currentTrackSelected = null;
+    		this.selectedKeyframes = [];
+    		this.selectedTweens = [];
+    		this._captureSelection = false;
+    		this._openDoc = false;
+    		this.end_hottext.value = 25;
+    		this.updateTrackContainerWidth();
+    		this.needsDraw = true;
+    	}
+    },
 
     updateTrackContainerWidth:{
         value: function(){
-- 
cgit v1.2.3