aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJon Reid2012-02-24 17:26:08 -0800
committerJon Reid2012-02-24 17:26:08 -0800
commitf14bc1ace048e46cbcb7148dbe37a5d2065a3779 (patch)
treeef3030d561a0bef731f84078d5ece503cd60f37e /js
parent1c4e8fbab587e589f348223847d6aac5c2df416b (diff)
downloadninja-f14bc1ace048e46cbcb7148dbe37a5d2065a3779.tar.gz
Timeline: Add grids to property tracks. First take on clearTimeline method on TimelinePanel class.
Diffstat (limited to 'js')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css6
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/images/gridline.jpgbin0 -> 724 bytes
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss1
-rw-r--r--js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js18
4 files changed, 22 insertions, 3 deletions
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 @@
3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 3 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6
7/* PropertyTrack.scss 6/* PropertyTrack.scss
8 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css. 7 * Main SCSS file for PropertyTrack component, compiled by SASS into the file css/PropertyTrack.css.
9 */ 8 */
10/* line 13, ../scss/PropertyTrack.scss */ 9/* line 19, ../scss/PropertyTrack.scss */
11.content-main .collapsible-content .timeline-track { 10.content-main .collapsible-content .timeline-track {
12 height: 20px; 11 height: 20px;
13 border-bottom: 1px solid #505050; 12 border-bottom: 1px solid #505050;
13 background-image: url("../images/gridline.jpg");
14} 14}
15 15
16/* line 19, ../scss/PropertyTrack.scss */ 16/* line 26, ../scss/PropertyTrack.scss */
17.timeline-track .content-main { 17.timeline-track .content-main {
18 background-color: #474747; 18 background-color: #474747;
19} 19}
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
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/images/gridline.jpg
Binary files 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 @@
19.content-main .collapsible-content .timeline-track { 19.content-main .collapsible-content .timeline-track {
20 height: 20px; 20 height: 20px;
21 border-bottom: 1px solid $color-menu-divider; 21 border-bottom: 1px solid $color-menu-divider;
22 background-image: url("../images/gridline.jpg");
22 } 23 }
23 24
24 25
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, {
242 _firstLayerDraw = true; 242 _firstLayerDraw = true;
243 } 243 }
244 }, 244 },
245
246 clearTimelinePanel : {
247 value: function() {
248 console.log('clearing timeline...')
249 this.arrTracks = null;
250 this.arrLayers = null;
251 this.currentLayerNumber = 0;
252 this.currentLayerSelected = null;
253 this.currentTrackSelected = null;
254 this.selectedKeyframes = [];
255 this.selectedTweens = [];
256 this._captureSelection = false;
257 this._openDoc = false;
258 this.end_hottext.value = 25;
259 this.updateTrackContainerWidth();
260 this.needsDraw = true;
261 }
262 },
245 263
246 updateTrackContainerWidth:{ 264 updateTrackContainerWidth:{
247 value: function(){ 265 value: function(){