From a39bad832722a10f6556f91e94c3301a41f59bd5 Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Mon, 6 Feb 2012 13:30:49 -0800 Subject: merge new timeline Signed-off-by: Jonathan Duran --- .../Timeline/TrackSpacer.reel/TrackSpacer.html | 26 ++++++++++++++++++++++ js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js | 15 +++++++++++++ .../Timeline/TrackSpacer.reel/css/TrackSpacer.css | 5 +++++ 3 files changed, 46 insertions(+) create mode 100644 js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html create mode 100644 js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js create mode 100644 js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css (limited to 'js/panels/Timeline/TrackSpacer.reel') diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html new file mode 100644 index 00000000..e6494d79 --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html @@ -0,0 +1,26 @@ + + + + + + + + + +

+ + + \ No newline at end of file diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js new file mode 100644 index 00000000..b3b8133a --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js @@ -0,0 +1,15 @@ +var Montage = require("montage/core/core").Montage; +var Component = require("montage/ui/component").Component; + +var TrackSpacer = exports.TrackSpacer = Montage.create(Component, { + + hasTemplate:{ + value: true + }, + + prepareForDraw:{ + value:function(){ + + } + } +}); diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css new file mode 100644 index 00000000..7a571fe8 --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css @@ -0,0 +1,5 @@ +.trackspacer{ + height:22px; + width: 100%; + background-color: #4d4d4d; +} \ No newline at end of file -- cgit v1.2.3 From 5de5dc6454fe6ca097ce4baf34768c9174a827d9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Fri, 24 Feb 2012 10:20:04 -0800 Subject: Adding some missing copyrights Signed-off-by: Valerio Virgillito --- js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | 5 +++++ js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js | 6 ++++++ js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css | 6 ++++++ 3 files changed, 17 insertions(+) (limited to 'js/panels/Timeline/TrackSpacer.reel') diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html index e6494d79..94f5c278 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html @@ -1,4 +1,9 @@ + diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js index b3b8133a..f1b5407a 100644 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + var Montage = require("montage/core/core").Montage; var Component = require("montage/ui/component").Component; diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css index 7a571fe8..b98b555d 100644 --- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css +++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css @@ -1,3 +1,9 @@ +/* + This file contains proprietary software owned by Motorola Mobility, Inc.
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+ (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. + */ + .trackspacer{ height:22px; width: 100%; -- cgit v1.2.3