Merge branch 'menu-fixes' of https://github.com/mencio/ninja into v0.7.1

author: Valerio Virgillito 2012-07-18 16:24:17 -0700
committer: Valerio Virgillito 2012-07-18 16:24:17 -0700
commit: 5ae767d4d47d0ed6846c7928ec219a70c3706639 (patch)
tree: 63051c2c69d436799ce2673e8496360496565c06 /js/components/menu/menu-item.reel/menu-item.html
parent: c1360b71e30cff1d90d7a3476ff2878821534d39 (diff)
parent: 6f2e455a77179f81dfd19037c078c158d3e14ee2 (diff)
download: ninja-5ae767d4d47d0ed6846c7928ec219a70c3706639.tar.gz
1 files changed, 0 insertions, 97 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
deleted file mode 100755
index 364a0997..00000000
--- a/js/components/menu/menu-item.reel/menu-item.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-item.css">
-    <script type="text/montage-serialization">
-        {
-            "entriesController": {
-                "prototype": "montage/ui/controller/array-controller",
-                "properties": {
-                    "automaticallyOrganizeObjects": false
-                },
-                "bindings": {
-                    "content": {"<-": "@owner.subentries"}
-                }
-            },
-            "repetition": {
-                "prototype": "montage/ui/repetition.reel",
-                "properties": {
-                    "element": {"#": "subEntries"},
-                    "contentController": {"@": "entriesController"}
-                }
-            },
-            "menuItem": {
-                "prototype": "js/components/menu/menu-item.reel",
-                "properties": {
-                    "element": {"#": "menuEntryItem" }
-                },
-                "bindings": {
-                    "data": {"<-": "@repetition.objectAtCurrentIteration"},
-                    "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"}
-                }
-            },
-            "owner": {
-                "prototype": "js/components/menu/menu-item.reel",
-                "properties": {
-                    "element":          {"#": "menuItem"},
-                    "itemBackground":   {"#": "menuItemBackground"},
-                    "itemText":         {"#": "menuItemText"},
-                    "subMenu":          {"#": "subEntries"}
-                }
-            }
-        }
-    </script>
-</head>
-<body>
-    <li data-montage-id="menuItem" class="menuItem">
-        <div data-montage-id="menuItemBackground" class="menubg">
-            <span class="check"></span>
-            <span data-montage-id="menuItemText" class="menu-label"></span>
-            <span class="rightArrow"></span>
-            <ul data-montage-id="subEntries" class="subEntries" style="display: none">
-                <li data-montage-id="menuEntryItem"></li>
-            </ul>
-        </div>
-    </li>
-</body>
-</html>
author	Valerio Virgillito	2012-07-18 16:24:17 -0700
committer	Valerio Virgillito	2012-07-18 16:24:17 -0700
commit	5ae767d4d47d0ed6846c7928ec219a70c3706639 (patch)
tree	63051c2c69d436799ce2673e8496360496565c06 /js/components/menu/menu-item.reel/menu-item.html
parent	c1360b71e30cff1d90d7a3476ff2878821534d39 (diff)
parent	6f2e455a77179f81dfd19037c078c158d3e14ee2 (diff)
download	ninja-5ae767d4d47d0ed6846c7928ec219a70c3706639.tar.gz

diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html deleted file mode 100755 index 364a0997..00000000 --- a/js/components/menu/menu-item.reel/menu-item.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-item.css">
36
37	<script type="text/montage-serialization">
38	{
39	"entriesController": {
40	"prototype": "montage/ui/controller/array-controller",
41	"properties": {
42	"automaticallyOrganizeObjects": false
43	},
44	"bindings": {
45	"content": {"<-": "@owner.subentries"}
46	}
47	},
48
49	"repetition": {
50	"prototype": "montage/ui/repetition.reel",
51	"properties": {
52	"element": {"#": "subEntries"},
53	"contentController": {"@": "entriesController"}
54	}
55	},
56
57	"menuItem": {
58	"prototype": "js/components/menu/menu-item.reel",
59	"properties": {
60	"element": {"#": "menuEntryItem" }
61	},
62	"bindings": {
63	"data": {"<-": "@repetition.objectAtCurrentIteration"},
64	"enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"}
65	}
66	},
67
68	"owner": {
69	"prototype": "js/components/menu/menu-item.reel",
70	"properties": {
71	"element": {"#": "menuItem"},
72	"itemBackground": {"#": "menuItemBackground"},
73	"itemText": {"#": "menuItemText"},
74	"subMenu": {"#": "subEntries"}
75	}
76	}
77	}
78	</script>
79
80	</head>
81	<body>
82
83	<li data-montage-id="menuItem" class="menuItem">
84	<div data-montage-id="menuItemBackground" class="menubg">
85	<span class="check"></span>
86	<span data-montage-id="menuItemText" class="menu-label"></span>
87	<span class="rightArrow"></span>
88
89	<ul data-montage-id="subEntries" class="subEntries" style="display: none">
90	<li data-montage-id="menuEntryItem"></li>
91	</ul>
92
93	</div>
94	</li>
95
96	</body>
97	</html>