diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/panels/Timeline/TrackSpacer.reel | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/panels/Timeline/TrackSpacer.reel')
| -rw-r--r-- | js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | 31 | ||||
| -rw-r--r-- | js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js | 21 | ||||
| -rw-r--r-- | js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css | 11 |
3 files changed, 63 insertions, 0 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html new file mode 100644 index 00000000..94f5c278 --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html lang="en"> | ||
| 8 | <head> | ||
| 9 | <meta http-equiv="content-type" content="text/html; charset=utf-8" /> | ||
| 10 | <link rel="stylesheet" type="text/css" href="css/TrackSpacer.css"> | ||
| 11 | <script type="text/montage-serialization"> | ||
| 12 | { | ||
| 13 | "owner": { | ||
| 14 | "module": "js/panels/Timeline/TrackSpacer.reel", | ||
| 15 | "name": "TrackSpacer", | ||
| 16 | "properties": { | ||
| 17 | "element": {"#": "trackspace"} | ||
| 18 | } | ||
| 19 | } | ||
| 20 | |||
| 21 | } | ||
| 22 | </script> | ||
| 23 | </head> | ||
| 24 | <body> | ||
| 25 | |||
| 26 | <div id="trackspace"> | ||
| 27 | <div id="track_spacer" class="trackspacer"></div> | ||
| 28 | </div> | ||
| 29 | |||
| 30 | </body> | ||
| 31 | </html> \ 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..f1b5407a --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js | |||
| @@ -0,0 +1,21 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<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. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | var Montage = require("montage/core/core").Montage; | ||
| 8 | var Component = require("montage/ui/component").Component; | ||
| 9 | |||
| 10 | var TrackSpacer = exports.TrackSpacer = Montage.create(Component, { | ||
| 11 | |||
| 12 | hasTemplate:{ | ||
| 13 | value: true | ||
| 14 | }, | ||
| 15 | |||
| 16 | prepareForDraw:{ | ||
| 17 | value:function(){ | ||
| 18 | |||
| 19 | } | ||
| 20 | } | ||
| 21 | }); | ||
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..b98b555d --- /dev/null +++ b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | /* <copyright> | ||
| 2 | This file contains proprietary software owned by Motorola Mobility, Inc.<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. | ||
| 5 | </copyright> */ | ||
| 6 | |||
| 7 | .trackspacer{ | ||
| 8 | height:22px; | ||
| 9 | width: 100%; | ||
| 10 | background-color: #4d4d4d; | ||
| 11 | } \ No newline at end of file | ||