Merge branch 'master' of github.com:Motorola-Mobility/ninja

author: John Mayhew 2012-07-24 15:46:16 -0700
committer: John Mayhew 2012-07-24 15:46:16 -0700
commit: 9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch)
tree: 407564eaa6466e8d4cf2eeee0c56dc623243586f /js/components/menu/menu.reel/menu.html
parent: d25359c75089215ee48838db081fd3d51cbbd85f (diff)
parent: 21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff)
download: ninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz
1 files changed, 0 insertions, 97 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html
deleted file mode 100755
index edbb8522..00000000
--- a/js/components/menu/menu.reel/menu.html
+++ /dev/null
@@ -1,97 +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>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link rel="stylesheet" type="text/css" href="menu.css">
-    <script type="text/montage-serialization">
-        {
-            "menudata": {
-                "prototype": "js/data/menu-data",
-                "bindings": {
-                    "currentDocument": {"<-": "@owner.currentDocument"}
-                }
-            },
-            "menuController": {
-                "prototype": "montage/ui/controller/array-controller",
-                "properties": {
-                    "automaticallyOrganizeObjects": false
-                },
-                "bindings": {
-                    "content": {"<-": "@menudata.topLevelMenu"}
-                }
-            },
-            "repetition": {
-                "prototype": "montage/ui/repetition.reel",
-                "properties": {
-                    "element": { "#": "topMenu" }
-                },
-                "bindings": {
-                    "objects": {"<-": "@menudata.topLevelMenu"}
-                }
-            },
-            "menuEntry": {
-                "prototype": "js/components/menu/menu-entry.reel",
-                "properties": {
-                    "element": { "#": "menuItem" }
-                },
-                "bindings": {
-                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
-                    "menuIsActive": {"<-": "@owner.active"}
-                }
-            },
-            "owner": {
-                "prototype": "js/components/menu/menu.reel",
-                "properties": {
-                    "element":  {"#": "mainMenuBar"}
-                }
-            }
-        }
-    </script>
-</head>
-<body>
-    <nav data-montage-id="mainMenuBar" class="mainMenuBar unselectable">
-        <ul data-montage-id="topMenu" class="horizontal-menu">
-            <li data-montage-id="menuItem"></li>
-        </ul>
-    </nav>
-</body>
-</html>
author	John Mayhew	2012-07-24 15:46:16 -0700
committer	John Mayhew	2012-07-24 15:46:16 -0700
commit	9f240b8b9b1f5fb0f145c343ca5e533e25e81374 (patch)
tree	407564eaa6466e8d4cf2eeee0c56dc623243586f /js/components/menu/menu.reel/menu.html
parent	d25359c75089215ee48838db081fd3d51cbbd85f (diff)
parent	21d74af1e9fc57cc25cea8aa7408beabf79ff2f3 (diff)
download	ninja-9f240b8b9b1f5fb0f145c343ca5e533e25e81374.tar.gz

diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html deleted file mode 100755 index edbb8522..00000000 --- a/js/components/menu/menu.reel/menu.html +++ /dev/null
@@ -1,97 +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>
33	<head>
34	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
35	<link rel="stylesheet" type="text/css" href="menu.css">
36
37	<script type="text/montage-serialization">
38	{
39	"menudata": {
40	"prototype": "js/data/menu-data",
41	"bindings": {
42	"currentDocument": {"<-": "@owner.currentDocument"}
43	}
44	},
45
46	"menuController": {
47	"prototype": "montage/ui/controller/array-controller",
48	"properties": {
49	"automaticallyOrganizeObjects": false
50	},
51	"bindings": {
52	"content": {"<-": "@menudata.topLevelMenu"}
53	}
54	},
55
56	"repetition": {
57	"prototype": "montage/ui/repetition.reel",
58	"properties": {
59	"element": { "#": "topMenu" }
60	},
61	"bindings": {
62	"objects": {"<-": "@menudata.topLevelMenu"}
63	}
64	},
65
66	"menuEntry": {
67	"prototype": "js/components/menu/menu-entry.reel",
68	"properties": {
69	"element": { "#": "menuItem" }
70	},
71	"bindings": {
72	"data": {"<-": "@repetition.objectAtCurrentIteration"},
73	"menuIsActive": {"<-": "@owner.active"}
74	}
75	},
76
77	"owner": {
78	"prototype": "js/components/menu/menu.reel",
79	"properties": {
80	"element": {"#": "mainMenuBar"}
81	}
82	}
83	}
84	</script>
85
86	</head>
87	<body>
88
89	<nav data-montage-id="mainMenuBar" class="mainMenuBar unselectable">
90	<ul data-montage-id="topMenu" class="horizontal-menu">
91	<li data-montage-id="menuItem"></li>
92	</ul>
93	</nav>
94
95
96	</body>
97	</html>