Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

author: Kruti Shah 2012-07-09 15:06:12 -0700
committer: Kruti Shah 2012-07-09 15:06:12 -0700
commit: ba1341b82d51a5380e7dd2dc91aef76caf635e60 (patch)
tree: 49745331a5b410d829a11a8bed21b167367be1d6 /js/panels/Timeline/TrackSpacer.reel
parent: 35a31845720beb1296dc42a79fa068601dfc52cb (diff)
parent: d874dda445a3baa2dd24b9554b6fc7f620dd5e89 (diff)
download: ninja-ba1341b82d51a5380e7dd2dc91aef76caf635e60.tar.gz
3 files changed, 0 insertions, 134 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
deleted file mode 100644
index b02e761e..00000000
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<!-- <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> -->
-<html lang="en">
-        <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="css/TrackSpacer.css">
-        <script type="text/montage-serialization">
-                    {
-                        "owner": {
-                            "prototype": "js/panels/Timeline/TrackSpacer.reel",
-                            "properties": {
-                                "element": {"#": "trackspace"}
-                            }
-                        }
-                    }
-        </script>
-        </head>
-        <body>
-        <div data-montage-id="trackspace">
-            <div data-montage-id="track_spacer" class="trackspacer"></div>
-        </div>
-    </body>
-</html>
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
deleted file mode 100644
index 50a949f8..00000000
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
-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
deleted file mode 100644
index bfdea55b..00000000
--- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
-All Rights Reserved.
-BSD License.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-  - Neither the name of Motorola Mobility nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
-.trackspacer{
-    height:22px;
-    width: 100%;
-    background-color: #4d4d4d;
-}
author	Kruti Shah	2012-07-09 15:06:12 -0700
committer	Kruti Shah	2012-07-09 15:06:12 -0700
commit	ba1341b82d51a5380e7dd2dc91aef76caf635e60 (patch)
tree	49745331a5b410d829a11a8bed21b167367be1d6 /js/panels/Timeline/TrackSpacer.reel
parent	35a31845720beb1296dc42a79fa068601dfc52cb (diff)
parent	d874dda445a3baa2dd24b9554b6fc7f620dd5e89 (diff)
download	ninja-ba1341b82d51a5380e7dd2dc91aef76caf635e60.tar.gz

diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html deleted file mode 100644 index b02e761e..00000000 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html +++ /dev/null
@@ -1,54 +0,0 @@
1	<!DOCTYPE html>
2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.
5	BSD License.
6
7	Redistribution and use in source and binary forms, with or without
8	modification, are permitted provided that the following conditions are met:
9
10	- Redistributions of source code must retain the above copyright notice,
11	this list of conditions and the following disclaimer.
12	- Redistributions in binary form must reproduce the above copyright
13	notice, this list of conditions and the following disclaimer in the
14	documentation and/or other materials provided with the distribution.
15	- Neither the name of Motorola Mobility nor the names of its contributors
16	may be used to endorse or promote products derived from this software
17	without specific prior written permission.
18
19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->
31	<html lang="en">
32	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="css/TrackSpacer.css">
35	<script type="text/montage-serialization">
36	{
37	"owner": {
38	"prototype": "js/panels/Timeline/TrackSpacer.reel",
39	"properties": {
40	"element": {"#": "trackspace"}
41	}
42	}
43
44	}
45	</script>
46	</head>
47	<body>
48
49	<div data-montage-id="trackspace">
50	<div data-montage-id="track_spacer" class="trackspacer"></div>
51	</div>
52
53	</body>
54	</html>


diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js deleted file mode 100644 index 50a949f8..00000000 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js +++ /dev/null
@@ -1,45 +0,0 @@
1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility, Inc
3	All Rights Reserved.
4	BSD License.
5
6	Redistribution and use in source and binary forms, with or without
7	modification, are permitted provided that the following conditions are met:
8
9	- Redistributions of source code must retain the above copyright notice,
10	this list of conditions and the following disclaimer.
11	- Redistributions in binary form must reproduce the above copyright
12	notice, this list of conditions and the following disclaimer in the
13	documentation and/or other materials provided with the distribution.
14	- Neither the name of Motorola Mobility nor the names of its contributors
15	may be used to endorse or promote products derived from this software
16	without specific prior written permission.
17
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */
30
31	var Montage = require("montage/core/core").Montage;
32	var Component = require("montage/ui/component").Component;
33
34	var TrackSpacer = exports.TrackSpacer = Montage.create(Component, {
35
36	hasTemplate:{
37	value: true
38	},
39
40	prepareForDraw:{
41	value:function(){
42
43	}
44	}
45	});


diff --git a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css b/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css deleted file mode 100644 index bfdea55b..00000000 --- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css +++ /dev/null
@@ -1,35 +0,0 @@
1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility, Inc
3	All Rights Reserved.
4	BSD License.
5
6	Redistribution and use in source and binary forms, with or without
7	modification, are permitted provided that the following conditions are met:
8
9	- Redistributions of source code must retain the above copyright notice,
10	this list of conditions and the following disclaimer.
11	- Redistributions in binary form must reproduce the above copyright
12	notice, this list of conditions and the following disclaimer in the
13	documentation and/or other materials provided with the distribution.
14	- Neither the name of Motorola Mobility nor the names of its contributors
15	may be used to endorse or promote products derived from this software
16	without specific prior written permission.
17
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */
30
31	.trackspacer{
32	height:22px;
33	width: 100%;
34	background-color: #4d4d4d;
35	}