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

author: hwc487 2012-03-21 15:26:24 -0700
committer: hwc487 2012-03-21 15:26:24 -0700
commit: 3f6c49bff64a9a765c16d2bd21994f57b557a94b (patch)
tree: 3a658595917a82aa67b9fc0de2916d5d7502feab /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
parent: eb59a523258cad3351cba9bf8de986e90a8e5b1c (diff)
parent: 57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff)
download: ninja-3f6c49bff64a9a765c16d2bd21994f57b557a94b.tar.gz
1 files changed, 74 insertions, 9 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
index 6ba4ac75..4e41512f 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -10,10 +10,75 @@
        <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
         <script type="text/montage-serialization">
        {
-             "materialInfo": {
+            "addButton": {
-                 "module": "js/panels/Materials/materials-popup.reel",
+                "prototype": "montage/ui/button.reel",
-                 "name": "MaterialsPopup"
+                "properties": {
+                    "element": {"#": "ml_add_btn"}
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+             },
+            "copyButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "ml_copy_btn"}
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
+             },
+            "deleteButton": {
+                "prototype": "montage/ui/button.reel",
+                "properties": {
+                    "element": {"#": "ml_delete_btn"}
+                },
+                "listeners": [
+                    {
+                        "type": "action",
+                        "listener": {"@": "owner"}
+                    }
+                ]
             },
+            "materialInfo": {
+                "module": "js/panels/Materials/materials-popup.reel",
+                "name": "MaterialsPopup"
+            },
+            "materialsController" : {
+                "module": "js/controllers/tree-controller",
+                "name": "TreeController",
+                "properties" : {
+                    "branchKey" : "children",
+                    "labelKey" : "label",
+                    "delegate": {"@": "owner" }
+                },
+                "bindings": {
+                    "content": {
+                        "boundObject": {"@": "owner"},
+                        "boundObjectPropertyPath": "materialsData"
+                    }
+                }
+            },
+            "materialsContainer" : {
+                "module" : "js/components/treeview/treeview.reel",
+                "name" : "Treeview",
+                "properties" : {
+                    "element" : {"#": "materials_library_tree"},
+                    "branchComponent" : {"@": "branch" },
+                    "contentController": {"@": "materialsController"},
+                    "showRoot": false
+                }
+            },
+            "branch" : {
+                "module" : "js/components/treeview/ninja-branch.reel",
+                "name" : "Branch"
+            },
            "owner": {
                "module": "js/panels/Materials/materials-library-panel.reel",
                "name": "MaterialsLibraryPanels",
@@ -29,14 +94,14 @@
        <body>
        <div id="materials_library_panel" class="materials_library_panel">
-            <div id="ml_tree_holder">
+            <section id="ml_tree_holder" class="animationsLibrary">
-                <ul id="materials_library_tree"></ul>
+                <div id="materials_library_tree"></div>
-            </div>
+            </section>
            <hr />
            <div id="ml_buttons">
-                <button id="ml_add_btn">Add</button>
+                <button id="ml_add_btn" class="nj-skinned">Add</button>
-                <button id="ml_copy_btn">Copy</button>
+                <button id="ml_copy_btn" class="nj-skinned">Copy</button>
-                <button id="ml_delete_btn">Delete</button>
+                <button id="ml_delete_btn" class="nj-skinned">Delete</button>
            </div>
        </div>
author	hwc487	2012-03-21 15:26:24 -0700
committer	hwc487	2012-03-21 15:26:24 -0700
commit	3f6c49bff64a9a765c16d2bd21994f57b557a94b (patch)
tree	3a658595917a82aa67b9fc0de2916d5d7502feab /js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
parent	eb59a523258cad3351cba9bf8de986e90a8e5b1c (diff)
parent	57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff)
download	ninja-3f6c49bff64a9a765c16d2bd21994f57b557a94b.tar.gz

diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html index 6ba4ac75..4e41512f 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
@@ -10,10 +10,75 @@
10	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">	10	<link rel="stylesheet" type="text/css" href="materials-library-panel.css">
11	<script type="text/montage-serialization">	11	<script type="text/montage-serialization">
12	{	12	{
13	"materialInfo": {	13	"addButton": {
14	"module": "js/panels/Materials/materials-popup.reel",	14	"prototype": "montage/ui/button.reel",
15	"name": "MaterialsPopup"	15	"properties": {
		16	"element": {"#": "ml_add_btn"}
		17	},
		18	"listeners": [
		19	{
		20	"type": "action",
		21	"listener": {"@": "owner"}
		22	}
		23	]
		24	},
		25	"copyButton": {
		26	"prototype": "montage/ui/button.reel",
		27	"properties": {
		28	"element": {"#": "ml_copy_btn"}
		29	},
		30	"listeners": [
		31	{
		32	"type": "action",
		33	"listener": {"@": "owner"}
		34	}
		35	]
		36	},
		37	"deleteButton": {
		38	"prototype": "montage/ui/button.reel",
		39	"properties": {
		40	"element": {"#": "ml_delete_btn"}
		41	},
		42	"listeners": [
		43	{
		44	"type": "action",
		45	"listener": {"@": "owner"}
		46	}
		47	]
16	},	48	},
		49	"materialInfo": {
		50	"module": "js/panels/Materials/materials-popup.reel",
		51	"name": "MaterialsPopup"
		52	},
		53	"materialsController" : {
		54	"module": "js/controllers/tree-controller",
		55	"name": "TreeController",
		56	"properties" : {
		57	"branchKey" : "children",
		58	"labelKey" : "label",
		59	"delegate": {"@": "owner" }
		60	},
		61	"bindings": {
		62	"content": {
		63	"boundObject": {"@": "owner"},
		64	"boundObjectPropertyPath": "materialsData"
		65	}
		66	}
		67	},
		68	"materialsContainer" : {
		69	"module" : "js/components/treeview/treeview.reel",
		70	"name" : "Treeview",
		71	"properties" : {
		72	"element" : {"#": "materials_library_tree"},
		73	"branchComponent" : {"@": "branch" },
		74	"contentController": {"@": "materialsController"},
		75	"showRoot": false
		76	}
		77	},
		78	"branch" : {
		79	"module" : "js/components/treeview/ninja-branch.reel",
		80	"name" : "Branch"
		81	},
17	"owner": {	82	"owner": {
18	"module": "js/panels/Materials/materials-library-panel.reel",	83	"module": "js/panels/Materials/materials-library-panel.reel",
19	"name": "MaterialsLibraryPanels",	84	"name": "MaterialsLibraryPanels",
@@ -29,14 +94,14 @@
29	<body>	94	<body>
30		95
31	<div id="materials_library_panel" class="materials_library_panel">	96	<div id="materials_library_panel" class="materials_library_panel">
32	<div id="ml_tree_holder">	97	<section id="ml_tree_holder" class="animationsLibrary">
33	<ul id="materials_library_tree"></ul>	98	<div id="materials_library_tree"></div>
34	</div>	99	</section>
35	<hr />	100	<hr />
36	<div id="ml_buttons">	101	<div id="ml_buttons">
37	<button id="ml_add_btn">Add</button>	102	<button id="ml_add_btn" class="nj-skinned">Add</button>
38	<button id="ml_copy_btn">Copy</button>	103	<button id="ml_copy_btn" class="nj-skinned">Copy</button>
39	<button id="ml_delete_btn">Delete</button>	104	<button id="ml_delete_btn" class="nj-skinned">Delete</button>
40	</div>	105	</div>
41	</div>	106	</div>
42		107