Merge branch 'refs/heads/master' into menu-fixes

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


diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js deleted file mode 100644 index c384aea0..00000000 --- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.js +++ /dev/null
@@ -1,46 +0,0 @@
1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility LLC.
3	All Rights Reserved.
4
5	Redistribution and use in source and binary forms, with or without
6	modification, are permitted provided that the following conditions are met:
7
8	* Redistributions of source code must retain the above copyright notice,
9	this list of conditions and the following disclaimer.
10
11	* Redistributions in binary form must reproduce the above copyright notice,
12	this list of conditions and the following disclaimer in the documentation
13	and/or other materials provided with the distribution.
14
15	* Neither the name of Motorola Mobility LLC nor the names of its
16	contributors may be used to endorse or promote products derived from this
17	software 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 HOLDER 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
32	var Montage = require("montage/core/core").Montage;
33	var Component = require("montage/ui/component").Component;
34
35	var TrackSpacer = exports.TrackSpacer = Montage.create(Component, {
36
37	hasTemplate:{
38	value: true
39	},
40
41	prepareForDraw:{
42	value:function(){
43
44	}
45	}
46	});


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 cd320bdb..00000000 --- a/js/panels/Timeline/TrackSpacer.reel/css/TrackSpacer.css +++ /dev/null
@@ -1,36 +0,0 @@
1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility LLC.
3	All Rights Reserved.
4
5	Redistribution and use in source and binary forms, with or without
6	modification, are permitted provided that the following conditions are met:
7
8	* Redistributions of source code must retain the above copyright notice,
9	this list of conditions and the following disclaimer.
10
11	* Redistributions in binary form must reproduce the above copyright notice,
12	this list of conditions and the following disclaimer in the documentation
13	and/or other materials provided with the distribution.
14
15	* Neither the name of Motorola Mobility LLC nor the names of its
16	contributors may be used to endorse or promote products derived from this
17	software 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 HOLDER 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
32	.trackspacer{
33	height:22px;
34	width: 100%;
35	background-color: #4d4d4d;
36	}