aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-03-21 13:24:51 -0700
committerValerio Virgillito2012-03-21 13:24:51 -0700
commit3f71deb9b8d1c99dbcf8c8a251903dab7c92dce0 (patch)
treee94c5619282b38ed0d0d3c826d6dbedac279e544 /js/panels/Materials/materials-library-panel.reel
parent8ee7f05753e84def43c158c30af7ecac68523847 (diff)
parent9facfb41b0b0f9fab9ddc9c8473af1d1d7e1ff18 (diff)
downloadninja-3f71deb9b8d1c99dbcf8c8a251903dab7c92dce0.tar.gz
Merge branch 'refs/heads/master' into montage-integration
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html43
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js66
2 files changed, 61 insertions, 48 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 fe17d0f8..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
@@ -46,10 +46,39 @@
46 } 46 }
47 ] 47 ]
48 }, 48 },
49 "materialInfo": { 49 "materialInfo": {
50 "module": "js/panels/Materials/materials-popup.reel", 50 "module": "js/panels/Materials/materials-popup.reel",
51 "name": "MaterialsPopup" 51 "name": "MaterialsPopup"
52 }, 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 },
53 "owner": { 82 "owner": {
54 "module": "js/panels/Materials/materials-library-panel.reel", 83 "module": "js/panels/Materials/materials-library-panel.reel",
55 "name": "MaterialsLibraryPanels", 84 "name": "MaterialsLibraryPanels",
@@ -65,9 +94,9 @@
65 <body> 94 <body>
66 95
67 <div id="materials_library_panel" class="materials_library_panel"> 96 <div id="materials_library_panel" class="materials_library_panel">
68 <div id="ml_tree_holder"> 97 <section id="ml_tree_holder" class="animationsLibrary">
69 <ul id="materials_library_tree"></ul> 98 <div id="materials_library_tree"></div>
70 </div> 99 </section>
71 <hr /> 100 <hr />
72 <div id="ml_buttons"> 101 <div id="ml_buttons">
73 <button id="ml_add_btn" class="nj-skinned">Add</button> 102 <button id="ml_add_btn" class="nj-skinned">Add</button>
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
index bb550598..2176c6d5 100755
--- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
+++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
@@ -4,53 +4,31 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */ 5</copyright> */
6 6
7var Tree = require("js/components/tree.reel").Tree, 7var Montage = require("montage/core/core").Montage,
8 MaterialsPopup = require("js/panels/Materials/materials-popup.reel").MaterialsPopup, 8 Component = require("montage/ui/component").Component,
9 PopupMananger = require("js/components/popup-manager.reel").PopupMananger, 9 MaterialsData = require("js/panels/Materials/materials-data.json"),
10 Popup = require("montage/ui/popup/popup.reel").Popup; 10 Popup = require("montage/ui/popup/popup.reel").Popup;
11 11
12exports.MaterialsLibraryPanel = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, { 12exports.MaterialsLibraryPanel = Montage.create(Component, {
13 13
14 _hasFocus: { 14 materialsData: {
15 enumerable: false, 15 value: null
16 value: false
17 }, 16 },
18
19 prepareForDraw: {
20 enumerable: false,
21 value: function() {
22 var treeHolderDiv = document.getElementById("materials_library_tree");
23 var materialsTree = Tree.create();
24 materialsTree.element = treeHolderDiv;
25 materialsTree.dataProvider = this._loadXMLDoc("js/panels/Materials/Materials.xml");
26 materialsTree.needsDraw = true;
27 17
28 materialsTree.addEventListener("change", this, true); 18 _hasFocus: {
29 }
30 },
31
32 willDraw: {
33 enumerable: false, 19 enumerable: false,
34 value: function() { 20 value: false
35
36 }
37 }, 21 },
38
39 draw: {
40 enumerable: false,
41 value: function() {
42 22
43 } 23 didCreate: {
24 value: function() {
25 this.materialsData = MaterialsData;
26 }
44 }, 27 },
45 28
46 _loadXMLDoc: { 29 prepareForDraw: {
47 value:function(dname) { 30 value : function() {
48 if (window.XMLHttpRequest) { 31 this.eventManager.addEventListener("showMaterialPopup", this, false);
49 xhttp = new XMLHttpRequest();
50 }
51 xhttp.open("GET", dname, false);
52 xhttp.send();
53 return xhttp.responseXML;
54 } 32 }
55 }, 33 },
56 34
@@ -71,10 +49,16 @@ exports.MaterialsLibraryPanel = (require("montage/core/core").Montage).create(re
71 } 49 }
72 }, 50 },
73 51
74 captureChange: { 52 handleNodeActivation: {
75 value:function(e) { 53 value:function(obj) {
76 var tNode = e._event.treeNode; 54 this._showMaterialPopup(obj.id);
77 this._showMaterialPopup(tNode.id); 55 }
56 },
57
58 handleShowMaterialPopup: {
59 enumerable: false,
60 value: function (event) {
61 this._showMaterialPopup(event.detail.materialId);
78 } 62 }
79 }, 63 },
80 64
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 04:18:44 +0000