menu design update and bug fixes - Moved Preview to the document bar

- Redesigned the menu and improved DOM structure. - Removed un-used entires - Fixed layout and snap entries - Moved the preview button to the document bar. - Fixes for bugs: #1750, #1867, #1876, #1895 Signed-off-by: Valerio Virgillito <valerio@motorola.com>
author: Valerio Virgillito 2012-07-17 23:34:57 -0700
committer: Valerio Virgillito 2012-07-17 23:34:57 -0700
commit: 8f78cb1377009dabde95f4a81d5090b79b9de0da (patch)
tree: 4b984909acba691eac8376e3b60412f632e3cdc3 /js/ui/menu/menu-entry.reel/menu-entry.html
parent: 4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
download: ninja-8f78cb1377009dabde95f4a81d5090b79b9de0da.tar.gz
1 files changed, 102 insertions, 0 deletions
diff --git a/js/ui/menu/menu-entry.reel/menu-entry.html b/js/ui/menu/menu-entry.reel/menu-entry.html
new file mode 100755
index 00000000..fd03b951
--- /dev/null
+++ b/js/ui/menu/menu-entry.reel/menu-entry.html
@@ -0,0 +1,102 @@
+<!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-entry.css">
+    <script type="text/montage-serialization">
+        {
+            "entriesController": {
+                "prototype": "montage/ui/controller/array-controller",
+                "bindings": {
+                    "content": {"<-": "@owner.entries"}
+                }
+            },
+            "menuHeaderButton": {
+                "prototype": "montage/ui/native/button.reel",
+                "properties": {
+                    "element": {"#": "menuHeaderButton"}
+                },
+                "bindings": {
+                    "label": {"<-": "@owner.label"}
+                }
+            },
+            "repetition": {
+                "prototype": "montage/ui/repetition.reel",
+                "properties": {
+                    "element": {"#": "subEntries"},
+                    "contentController": {"@": "entriesController"}
+                }
+            },
+            "menuItem": {
+                "prototype": "js/ui/menu/menu-item.reel",
+                "properties": {
+                    "element": { "#": "menuEntryItem" }
+                },
+                "bindings": {
+                    "enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"},
+                    "checked": {"<-": "@repetition.objectAtCurrentIteration.checked"},
+                    "label": {"<-": "@repetition.objectAtCurrentIteration.label"},
+                    "submenu": {"<-": "@repetition.objectAtCurrentIteration.submenu"},
+                    "entries": {"<-": "@repetition.objectAtCurrentIteration.entries"},
+                    "action": {"<-": "@repetition.objectAtCurrentIteration.action"}
+                }
+            },
+            "owner": {
+                "prototype": "js/ui/menu/menu-entry.reel",
+                "properties": {
+                    "element":              {"#": "menuItem"},
+                    "menuHeaderButton":     {"@": "menuHeaderButton"}
+                }
+            }
+        }
+    </script>
+</head>
+<body>
+    <li data-montage-id="menuItem" class="topMenuItem">
+        <button data-montage-id="menuHeaderButton" class="headerButton"></button>
+        <ul data-montage-id="subEntries" class="subEntries" style="z-index: 9991;">
+            <li data-montage-id="menuEntryItem"></li>
+        </ul>
+    </li>
+</body>
+</html>
author	Valerio Virgillito	2012-07-17 23:34:57 -0700
committer	Valerio Virgillito	2012-07-17 23:34:57 -0700
commit	8f78cb1377009dabde95f4a81d5090b79b9de0da (patch)
tree	4b984909acba691eac8376e3b60412f632e3cdc3 /js/ui/menu/menu-entry.reel/menu-entry.html
parent	4f737b24c19ddc02d20f9783b8b080fc6ef11142 (diff)
download	ninja-8f78cb1377009dabde95f4a81d5090b79b9de0da.tar.gz

diff --git a/js/ui/menu/menu-entry.reel/menu-entry.html b/js/ui/menu/menu-entry.reel/menu-entry.html new file mode 100755 index 00000000..fd03b951 --- /dev/null +++ b/js/ui/menu/menu-entry.reel/menu-entry.html
@@ -0,0 +1,102 @@
	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-entry.css">
	36
	37	<script type="text/montage-serialization">
	38	{
	39	"entriesController": {
	40	"prototype": "montage/ui/controller/array-controller",
	41	"bindings": {
	42	"content": {"<-": "@owner.entries"}
	43	}
	44	},
	45
	46	"menuHeaderButton": {
	47	"prototype": "montage/ui/native/button.reel",
	48	"properties": {
	49	"element": {"#": "menuHeaderButton"}
	50	},
	51	"bindings": {
	52	"label": {"<-": "@owner.label"}
	53	}
	54	},
	55
	56	"repetition": {
	57	"prototype": "montage/ui/repetition.reel",
	58	"properties": {
	59	"element": {"#": "subEntries"},
	60	"contentController": {"@": "entriesController"}
	61	}
	62	},
	63
	64	"menuItem": {
	65	"prototype": "js/ui/menu/menu-item.reel",
	66	"properties": {
	67	"element": { "#": "menuEntryItem" }
	68	},
	69	"bindings": {
	70	"enabled": {"<-": "@repetition.objectAtCurrentIteration.enabled"},
	71	"checked": {"<-": "@repetition.objectAtCurrentIteration.checked"},
	72	"label": {"<-": "@repetition.objectAtCurrentIteration.label"},
	73	"submenu": {"<-": "@repetition.objectAtCurrentIteration.submenu"},
	74	"entries": {"<-": "@repetition.objectAtCurrentIteration.entries"},
	75	"action": {"<-": "@repetition.objectAtCurrentIteration.action"}
	76	}
	77	},
	78
	79	"owner": {
	80	"prototype": "js/ui/menu/menu-entry.reel",
	81	"properties": {
	82	"element": {"#": "menuItem"},
	83	"menuHeaderButton": {"@": "menuHeaderButton"}
	84	}
	85	}
	86	}
	87	</script>
	88
	89	</head>
	90	<body>
	91
	92	<li data-montage-id="menuItem" class="topMenuItem">
	93	<button data-montage-id="menuHeaderButton" class="headerButton"></button>
	94
	95	<ul data-montage-id="subEntries" class="subEntries" style="z-index: 9991;">
	96	<li data-montage-id="menuEntryItem"></li>
	97	</ul>
	98
	99	</li>
	100
	101	</body>
	102	</html>