Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

author: Jon Reid 2012-07-09 14:53:00 -0700
committer: Jon Reid 2012-07-09 14:53:00 -0700
commit: 65a9d88691a9f10130ebd853492dab0d59f4aa53 (patch)
tree: 0bbb855eadc71c09a1118a22f275f01b735f2ac5 /js/panels/Timeline/Track.reel/Track.html
parent: d2ae0619d673e66d59d7a0584fc14d420511dcdf (diff)
parent: d874dda445a3baa2dd24b9554b6fc7f620dd5e89 (diff)
download: ninja-65a9d88691a9f10130ebd853492dab0d59f4aa53.tar.gz
1 files changed, 0 insertions, 87 deletions
diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html
deleted file mode 100644
index 6be86ef6..00000000
--- a/js/panels/Timeline/Track.reel/Track.html
+++ /dev/null
@@ -1,87 +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/Track.css">
-                <script type="text/montage-serialization">
-            {
-                "owner": {
-                    "prototype": "js/panels/Timeline/Track.reel",
-                    "properties": {
-                        "element": {"#": "track"},
-                        "spanRepetition" : {"@" : "spanRepetition"},
-                        "track_lane": {"#": "track_lane"}
-                    }
-                },
-                "trackslot": {
-                    "prototype": "montage/ui/slot.reel",
-                    "properties": {
-                        "element": {"#": "track_lane"}
-                    },
-                    "bindings" : {
-                        "content" : {
-                            "boundObject" : {"@": "spanRepetition"},
-                            "boundObjectPropertyPath" : "objectAtCurrentIteration",
-                            "oneway" : false
-                        }
-                    }
-                },
-                "spanRepetition": {
-                        "prototype": "montage/ui/repetition.reel",
-                        "properties": {
-                            "element": {"#": "track_lanes"},
-                                "isSelectionEnabled" : true
-                        },
-                        "bindings": {
-                            "objects": {
-                                "boundObject": {"@": "owner"},
-                                "boundObjectPropertyPath": "spans",
-                                "oneway": false
-                            }
-                        }
-                }
-            }
-        </script>
-        </head>
-        <body>
-        <div data-montage-id="track">
-            <div data-montage-id="track_lanes">
-                <div data-montage-id="track_lane" class="tracklane"></div>
-            </div>
-        </div>
-    </body>
-</html>
author	Jon Reid	2012-07-09 14:53:00 -0700
committer	Jon Reid	2012-07-09 14:53:00 -0700
commit	65a9d88691a9f10130ebd853492dab0d59f4aa53 (patch)
tree	0bbb855eadc71c09a1118a22f275f01b735f2ac5 /js/panels/Timeline/Track.reel/Track.html
parent	d2ae0619d673e66d59d7a0584fc14d420511dcdf (diff)
parent	d874dda445a3baa2dd24b9554b6fc7f620dd5e89 (diff)
download	ninja-65a9d88691a9f10130ebd853492dab0d59f4aa53.tar.gz

diff --git a/js/panels/Timeline/Track.reel/Track.html b/js/panels/Timeline/Track.reel/Track.html deleted file mode 100644 index 6be86ef6..00000000 --- a/js/panels/Timeline/Track.reel/Track.html +++ /dev/null
@@ -1,87 +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/Track.css">
35	<script type="text/montage-serialization">
36	{
37	"owner": {
38	"prototype": "js/panels/Timeline/Track.reel",
39	"properties": {
40	"element": {"#": "track"},
41	"spanRepetition" : {"@" : "spanRepetition"},
42	"track_lane": {"#": "track_lane"}
43	}
44	},
45
46	"trackslot": {
47	"prototype": "montage/ui/slot.reel",
48	"properties": {
49	"element": {"#": "track_lane"}
50	},
51	"bindings" : {
52	"content" : {
53	"boundObject" : {"@": "spanRepetition"},
54	"boundObjectPropertyPath" : "objectAtCurrentIteration",
55	"oneway" : false
56	}
57	}
58	},
59
60	"spanRepetition": {
61	"prototype": "montage/ui/repetition.reel",
62	"properties": {
63	"element": {"#": "track_lanes"},
64	"isSelectionEnabled" : true
65	},
66	"bindings": {
67	"objects": {
68	"boundObject": {"@": "owner"},
69	"boundObjectPropertyPath": "spans",
70	"oneway": false
71	}
72	}
73	}
74
75	}
76	</script>
77	</head>
78	<body>
79
80	<div data-montage-id="track">
81	<div data-montage-id="track_lanes">
82	<div data-montage-id="track_lane" class="tracklane"></div>
83	</div>
84	</div>
85
86	</body>
87	</html>