Merge branch 'refs/heads/Ninja-Internal' into FileIO

author: Jose Antonio Marquez 2012-03-01 18:13:18 -0800
committer: Jose Antonio Marquez 2012-03-01 18:13:18 -0800
commit: 66bc1f46938afc696b11878ebbb97d1fd361386e (patch)
tree: a4e8d066bf80a43f42ce971a3ca05ab88f457d16 /js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html
parent: 80ac930684255dd24cecae70b488285a6058488e (diff)
parent: 61dd921d5bb06ab47ee84506dbaaeaf4895ebf42 (diff)
download: ninja-66bc1f46938afc696b11878ebbb97d1fd361386e.tar.gz
1 files changed, 100 insertions, 16 deletions
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html
index 5c6ac227..76f6b9c4 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html
@@ -9,35 +9,103 @@
    <script type="text/montage-serialization">
        {
-            "panel": {
+            "panelData": {
-                "module": "js/panels/Panel.reel",
+                "module": "js/data/panels-data",
-                "name": "Panel",
+                "name": "PanelsData"
+            },
+            "PanelController": {
+                "module": "montage/ui/controller/array-controller",
+                "name"  : "ArrayController",
                "properties": {
-                    "element": {"#": "panel"}
+                    "automaticallyOrganizeObjects": true
                },
                "bindings": {
-                    "panelBase": {
+                    "content": {
-                        "boundObject": {"@": "repetition1"},
+                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
+                        "boundObjectPropertyPath": "panels",
                        "oneway": true
                    }
                }
            },
            "repetition1": {
                "module": "montage/ui/repetition.reel",
                "name": "Repetition",
                "properties": {
-                    "element": {"#": "panels"}
+                    "element": {"#": "panels"},
+                    "contentController": {"@" : "PanelController"}
+                }
+            },
+            "panel": {
+                "module": "js/panels/Panel.reel",
+                "name": "Panel",
+                "properties": {
+                    "element": {"#": "panel"},
+                    "identifier" : "panels"
                },
                "bindings": {
-                    "objects": {
+                    "name": {
-                        "boundObject": {"@": "owner"},
+                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "_panels",
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.name",
+                        "oneway": true
+                    },
+                    "height": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.height",
+                        "oneway": false
+                    },
+                    "minHeight": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.minHeight",
+                        "oneway": true
+                    },
+                    "maxHeight": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.maxHeight",
+                        "oneway": true
+                    },
+                    "flexible": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.flexible",
+                        "oneway": true
+                    },
+                    "collapsed": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.collapsed",
+                        "oneway": false
+                    },
+                    "modulePath": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.modulePath",
                        "oneway": true
+                    },
+                    "moduleName": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.moduleName",
+                        "oneway": true
+                    },
+                    "contentComponent": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.contentComponent",
+                        "oneway": false
                    }
-                }
+                },
+                "listeners": [
+                    {
+                        "type": "resizeStart",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeMove",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "resizeEnd",
+                        "listener": {"@": "owner"}
+                    }
+                ]
            },
            "owner": {
@@ -45,8 +113,24 @@
                "name": "PanelContainer",
                "properties": {
                    "element": {"#": "panelContainer"},
-                    "repeater": {"@": "repetition1"}
+                    "repeater": {"@": "repetition1"},
-                }
+                    "panelData": {"@": "panelData" },
+                    "panelController" : {"@" : "PanelController"}
+                },
+                "listeners": [
+                    {
+                        "type": "panelResizing",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    },
+                    {
+                        "type": "dropped",
+                        "listener": {"@": "owner"}
+                    }
+                ]
            }
        }
    </script>
@@ -55,7 +139,7 @@
 <body>
    <section id="panelContainer">
                <article id="panels" class="panels">
-            <article id="panel" class="panel"></article>
+            <article id="panel"></article>
                </article>
    </section>
 </body>
author	Jose Antonio Marquez	2012-03-01 18:13:18 -0800
committer	Jose Antonio Marquez	2012-03-01 18:13:18 -0800
commit	66bc1f46938afc696b11878ebbb97d1fd361386e (patch)
tree	a4e8d066bf80a43f42ce971a3ca05ab88f457d16 /js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html
parent	80ac930684255dd24cecae70b488285a6058488e (diff)
parent	61dd921d5bb06ab47ee84506dbaaeaf4895ebf42 (diff)
download	ninja-66bc1f46938afc696b11878ebbb97d1fd361386e.tar.gz

diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html index 5c6ac227..76f6b9c4 100755 --- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.html
@@ -9,35 +9,103 @@
9		9
10	<script type="text/montage-serialization">	10	<script type="text/montage-serialization">
11	{	11	{
12	"panel": {	12	"panelData": {
13	"module": "js/panels/Panel.reel",	13	"module": "js/data/panels-data",
14	"name": "Panel",	14	"name": "PanelsData"
		15	},
		16
		17	"PanelController": {
		18	"module": "montage/ui/controller/array-controller",
		19	"name" : "ArrayController",
15	"properties": {	20	"properties": {
16	"element": {"#": "panel"}	21	"automaticallyOrganizeObjects": true
17	},	22	},
18	"bindings": {	23	"bindings": {
19	"panelBase": {	24	"content": {
20	"boundObject": {"@": "repetition1"},	25	"boundObject": {"@": "owner"},
21	"boundObjectPropertyPath": "objectAtCurrentIteration",	26	"boundObjectPropertyPath": "panels",
22	"oneway": true	27	"oneway": true
23	}	28	}
24	}	29	}
25	},	30	},
26		31
27
28	"repetition1": {	32	"repetition1": {
29	"module": "montage/ui/repetition.reel",	33	"module": "montage/ui/repetition.reel",
30	"name": "Repetition",	34	"name": "Repetition",
31	"properties": {	35	"properties": {
32	"element": {"#": "panels"}	36	"element": {"#": "panels"},
		37	"contentController": {"@" : "PanelController"}
		38	}
		39	},
		40
		41	"panel": {
		42	"module": "js/panels/Panel.reel",
		43	"name": "Panel",
		44	"properties": {
		45	"element": {"#": "panel"},
		46	"identifier" : "panels"
33	},	47	},
34	"bindings": {	48	"bindings": {
35	"objects": {	49	"name": {
36	"boundObject": {"@": "owner"},	50	"boundObject": {"@": "repetition1"},
37	"boundObjectPropertyPath": "_panels",	51	"boundObjectPropertyPath": "objectAtCurrentIteration.name",
		52	"oneway": true
		53	},
		54	"height": {
		55	"boundObject": {"@": "repetition1"},
		56	"boundObjectPropertyPath": "objectAtCurrentIteration.height",
		57	"oneway": false
		58	},
		59	"minHeight": {
		60	"boundObject": {"@": "repetition1"},
		61	"boundObjectPropertyPath": "objectAtCurrentIteration.minHeight",
		62	"oneway": true
		63	},
		64	"maxHeight": {
		65	"boundObject": {"@": "repetition1"},
		66	"boundObjectPropertyPath": "objectAtCurrentIteration.maxHeight",
		67	"oneway": true
		68	},
		69	"flexible": {
		70	"boundObject": {"@": "repetition1"},
		71	"boundObjectPropertyPath": "objectAtCurrentIteration.flexible",
		72	"oneway": true
		73	},
		74	"collapsed": {
		75	"boundObject": {"@": "repetition1"},
		76	"boundObjectPropertyPath": "objectAtCurrentIteration.collapsed",
		77	"oneway": false
		78	},
		79	"modulePath": {
		80	"boundObject": {"@": "repetition1"},
		81	"boundObjectPropertyPath": "objectAtCurrentIteration.modulePath",
38	"oneway": true	82	"oneway": true
		83	},
		84	"moduleName": {
		85	"boundObject": {"@": "repetition1"},
		86	"boundObjectPropertyPath": "objectAtCurrentIteration.moduleName",
		87	"oneway": true
		88	},
		89	"contentComponent": {
		90	"boundObject": {"@": "repetition1"},
		91	"boundObjectPropertyPath": "objectAtCurrentIteration.contentComponent",
		92	"oneway": false
39	}	93	}
40	}	94	},
		95	"listeners": [
		96	{
		97	"type": "resizeStart",
		98	"listener": {"@": "owner"}
		99	},
		100	{
		101	"type": "resizeMove",
		102	"listener": {"@": "owner"}
		103	},
		104	{
		105	"type": "resizeEnd",
		106	"listener": {"@": "owner"}
		107	}
		108	]
41	},	109	},
42		110
43	"owner": {	111	"owner": {
@@ -45,8 +113,24 @@
45	"name": "PanelContainer",	113	"name": "PanelContainer",
46	"properties": {	114	"properties": {
47	"element": {"#": "panelContainer"},	115	"element": {"#": "panelContainer"},
48	"repeater": {"@": "repetition1"}	116	"repeater": {"@": "repetition1"},
49	}	117	"panelData": {"@": "panelData" },
		118	"panelController" : {"@" : "PanelController"}
		119	},
		120	"listeners": [
		121	{
		122	"type": "panelResizing",
		123	"listener": {"@": "owner"}
		124	},
		125	{
		126	"type": "action",
		127	"listener": {"@": "owner"}
		128	},
		129	{
		130	"type": "dropped",
		131	"listener": {"@": "owner"}
		132	}
		133	]
50	}	134	}
51	}	135	}
52	</script>	136	</script>
@@ -55,7 +139,7 @@
55	<body>	139	<body>
56	<section id="panelContainer">	140	<section id="panelContainer">
57	<article id="panels" class="panels">	141	<article id="panels" class="panels">
58	<article id="panel" class="panel"></article>	142	<article id="panel"></article>
59	</article>	143	</article>
60	</section>	144	</section>
61	</body>	145	</body>