From e4159f8cea57077c755030a421c091b28c7a8ecc Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Mon, 19 Mar 2012 17:06:20 -0700
Subject: Use new tree control in Materials panel.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../materials-library-panel.js                     | 34 ++++++++++------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.js')

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..5fd86d00 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,29 +4,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
 
-var Tree = require("js/components/tree.reel").Tree,
-    MaterialsPopup = require("js/panels/Materials/materials-popup.reel").MaterialsPopup,
-    PopupMananger =		require("js/components/popup-manager.reel").PopupMananger,
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
+    MaterialsData = require("js/panels/Materials/materials-data.json"),
     Popup = require("montage/ui/popup/popup.reel").Popup;
 
-exports.MaterialsLibraryPanel = (require("montage/core/core").Montage).create(require("montage/ui/component").Component, {
+exports.MaterialsLibraryPanel = Montage.create(Component, {
+
+    materialsData: {
+        value: null
+    },
 
     _hasFocus: {
     	enumerable: false,
     	value: false
     },
-    
-    prepareForDraw: {
-    	enumerable: false,
-    	value: function() {
-            var treeHolderDiv = document.getElementById("materials_library_tree");
-            var materialsTree = Tree.create();
-            materialsTree.element = treeHolderDiv;
-            materialsTree.dataProvider = this._loadXMLDoc("js/panels/Materials/Materials.xml");
-            materialsTree.needsDraw = true;
 
-            materialsTree.addEventListener("change", this, true);
-    	}
+    didCreate: {
+        value: function() {
+            this.materialsData = MaterialsData;
+        }
     },
 
     willDraw: {
@@ -71,10 +68,9 @@ exports.MaterialsLibraryPanel = (require("montage/core/core").Montage).create(re
         }
     },
 
-    captureChange: {
-        value:function(e) {
-            var tNode = e._event.treeNode;
-            this._showMaterialPopup(tNode.id);
+    handleNodeActivation: {
+        value:function(obj) {
+            this._showMaterialPopup(obj.id);
         }
     },
 
-- 
cgit v1.2.3


From e1c4f30a4c13d747fa69d78598e0961286bbe571 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Tue, 20 Mar 2012 10:59:05 -0700
Subject: Support button control in Properties Panel and use them for edit fill
 and stroke material.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
 .../materials-library-panel.js                     | 32 +++++++---------------
 1 file changed, 10 insertions(+), 22 deletions(-)

(limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.js')

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 5fd86d00..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
@@ -26,28 +26,9 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
         }
     },
 
-    willDraw: {
-    	enumerable: false,
-    	value: function() {
-
-    	}
-    },
-    
-    draw: {
-    	enumerable: false,
-    	value: function() {
-
-    	}
-    },
-
-    _loadXMLDoc: {
-        value:function(dname) {
-            if (window.XMLHttpRequest) {
-                xhttp = new XMLHttpRequest();
-            }
-            xhttp.open("GET", dname, false);
-            xhttp.send();
-            return xhttp.responseXML;
+    prepareForDraw: {
+        value : function() {
+            this.eventManager.addEventListener("showMaterialPopup", this, false);
         }
     },
 
@@ -74,6 +55,13 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
         }
     },
 
+    handleShowMaterialPopup: {
+        enumerable: false,
+        value: function (event) {
+            this._showMaterialPopup(event.detail.materialId);
+        }
+    },
+
     _materialPopup: {
         enumerable:true,
         value:null
-- 
cgit v1.2.3