Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts: js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
author: Eric Guzman 2012-03-12 15:33:04 -0700
committer: Eric Guzman 2012-03-12 15:33:04 -0700
commit: 7e3161153b87b891875ac65368a19aed12909fa3 (patch)
tree: b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/panels/PanelContainer.reel/PanelContainer.html
parent: 7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff)
parent: 69d90467865a1384725b2301901be2180c5a841f (diff)
download: ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz
1 files changed, 110 insertions, 0 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
new file mode 100755
index 00000000..251e86e4
--- /dev/null
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -0,0 +1,110 @@
+<!DOCTYPE html>
+<!-- <copyright>
+ This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+ No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+ (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+ </copyright> -->
+<html lang="en">
+<head>
+    <script type="text/montage-serialization">
+        {
+            "panelData": {
+                "module": "js/data/panels-data",
+                "name": "PanelsData"
+            },
+            "panel_0": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_0"}
+                }
+            },
+            "panel_1": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_1"}
+                }
+            },
+            "panel_2": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_2"}
+                }
+            },
+            "panel_3": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_3"}
+                }
+            },
+            "panel_4": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_4"}
+                }
+            },
+            "panel_5": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel_5"}
+                }
+            },
+            "owner": {
+                "module": "js/panels/PanelContainer.reel",
+                "name": "PanelContainer",
+                "properties": {
+                    "element": {"#": "panelContainer"},
+                    "panelData": {"@": "panelData" },
+                    "panelController" : {"@": "PanelController"},
+                    "panel_0":          {"@": "panel_0"},
+                    "panel_1":          {"@": "panel_1"},
+                    "panel_2":          {"@": "panel_2"},
+                    "panel_3":          {"@": "panel_3"},
+                    "panel_4":          {"@": "panel_4"},
+                    "panel_5":          {"@": "panel_5"}
+                },
+                "listeners": [
+                    {
+                        "type": "panelResizing",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "dropped",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+            }
+        }
+    </script>
+        </head>
+<body>
+    <section id="panelContainer">
+                <article id="panels" class="panels">
+            <article data-montage-id="panel_0"></article>
+            <article data-montage-id="panel_1"></article>
+            <article data-montage-id="panel_2"></article>
+            <article data-montage-id="panel_3"></article>
+            <article data-montage-id="panel_4"></article>
+            <article data-montage-id="panel_5"></article>
+                </article>
+    </section>
+</body>
+</html>
+\ No newline at end of file
author	Eric Guzman	2012-03-12 15:33:04 -0700
committer	Eric Guzman	2012-03-12 15:33:04 -0700
commit	7e3161153b87b891875ac65368a19aed12909fa3 (patch)
tree	b80f48d711a9729fc39dbbdff28c4f0620e7302d /js/panels/PanelContainer.reel/PanelContainer.html
parent	7a28932ba8a7517bbaaabe1f5edf678416aafc9c (diff)
parent	69d90467865a1384725b2301901be2180c5a841f (diff)
download	ninja-7e3161153b87b891875ac65368a19aed12909fa3.tar.gz

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html new file mode 100755 index 00000000..251e86e4 --- /dev/null +++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -0,0 +1,110 @@
	1	<!DOCTYPE html>
	2	<!-- <copyright>
	3	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
	4	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
	5	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
	6	</copyright> -->
	7	<html lang="en">
	8	<head>
	9
	10	<script type="text/montage-serialization">
	11	{
	12	"panelData": {
	13	"module": "js/data/panels-data",
	14	"name": "PanelsData"
	15	},
	16
	17	"panel_0": {
	18	"module": "js/panels/Panel.reel",
	19	"name": "Panel",
	20	"properties": {
	21	"element": {"#": "panel_0"}
	22	}
	23	},
	24
	25	"panel_1": {
	26	"module": "js/panels/Panel.reel",
	27	"name": "Panel",
	28	"properties": {
	29	"element": {"#": "panel_1"}
	30	}
	31	},
	32
	33	"panel_2": {
	34	"module": "js/panels/Panel.reel",
	35	"name": "Panel",
	36	"properties": {
	37	"element": {"#": "panel_2"}
	38	}
	39	},
	40
	41	"panel_3": {
	42	"module": "js/panels/Panel.reel",
	43	"name": "Panel",
	44	"properties": {
	45	"element": {"#": "panel_3"}
	46	}
	47	},
	48
	49	"panel_4": {
	50	"module": "js/panels/Panel.reel",
	51	"name": "Panel",
	52	"properties": {
	53	"element": {"#": "panel_4"}
	54	}
	55	},
	56
	57	"panel_5": {
	58	"module": "js/panels/Panel.reel",
	59	"name": "Panel",
	60	"properties": {
	61	"element": {"#": "panel_5"}
	62	}
	63	},
	64
	65	"owner": {
	66	"module": "js/panels/PanelContainer.reel",
	67	"name": "PanelContainer",
	68	"properties": {
	69	"element": {"#": "panelContainer"},
	70	"panelData": {"@": "panelData" },
	71	"panelController" : {"@": "PanelController"},
	72	"panel_0": {"@": "panel_0"},
	73	"panel_1": {"@": "panel_1"},
	74	"panel_2": {"@": "panel_2"},
	75	"panel_3": {"@": "panel_3"},
	76	"panel_4": {"@": "panel_4"},
	77	"panel_5": {"@": "panel_5"}
	78	},
	79	"listeners": [
	80	{
	81	"type": "panelResizing",
	82	"listener": {"@": "owner"}
	83	},
	84	{
	85	"type": "action",
	86	"listener": {"@": "owner"}
	87	},
	88	{
	89	"type": "dropped",
	90	"listener": {"@": "owner"}
	91	}
	92	]
	93	}
	94	}
	95	</script>
	96
	97	</head>
	98	<body>
	99	<section id="panelContainer">
	100	<article id="panels" class="panels">
	101	<article data-montage-id="panel_0"></article>
	102	<article data-montage-id="panel_1"></article>
	103	<article data-montage-id="panel_2"></article>
	104	<article data-montage-id="panel_3"></article>
	105	<article data-montage-id="panel_4"></article>
	106	<article data-montage-id="panel_5"></article>
	107	</article>
	108	</section>
	109	</body>
	110	</html> \ No newline at end of file