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

Conflicts:
	js/helper-classes/3D/StageLine.js

1 files changed, 111 insertions, 20 deletions

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 b5d6bb96..873184dc 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
@@ -31,17 +31,39 @@ POSSIBILITY OF SUCH DAMAGE.
 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;
+    Popup = require("montage/ui/popup/popup.reel").Popup,
+    MaterialsModel = require("js/models/materials-model").MaterialsModel,
+    LeafNode = require("js/components/treeview/ninja-leaf.reel").Leaf;
 
 exports.MaterialsLibraryPanel = Montage.create(Component, {
 
+    deleteButton: {
+        value: null
+    },
+
     materialsData: {
         value: null
     },
 
+    materialId: {
+        value: null
+    },
+
+    selectedMaterialNode: {
+        value: null
+    },
+
+    customMaterialsBranch: {
+        value: null
+    },
+
+    customMaterialsCounter: {
+        value: 2
+    },
+
     _hasFocus: {
-        enumerable: false,
-        value: false
+        enumerable: false,
+        value: false
     },
 
     didCreate: {
@@ -60,21 +82,32 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
         value:function(event) {
             switch(event._currentTarget.label)
             {
-                case "Add":
-                    console.log("Add new material");
+                case "Duplicate":
+                    this.duplicateMaterial();
                     break;
-                case "Copy":
-                    console.log("Copy selected material");
+                case "Edit":
+//                    console.log("Edit selected material");
+                    this._showMaterialPopup({ materialId: this.materialId });
                     break;
                 case "Delete":
-                    console.log("Delete selected material");
+                    this.deleteMaterial();
                     break;
             }
         }
     },
 
     handleNodeActivation: {
-        value:function(obj) {
+        value: function(obj, event) {
+            this.selectedMaterialNode = event.currentTarget;
+            this.materialId = obj.id;
+            this.deleteButton.enabled = !!obj.canDelete;
+        }
+    },
+
+    handleDblclick: {
+        value:function(obj, event) {
+            this.selectedMaterialNode = event.currentTarget;
+            this.materialId = obj.id;
             this._showMaterialPopup({ materialId: obj.id });
         }
     },
@@ -82,7 +115,6 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
     handleShowMaterialPopup: {
         enumerable: false,
         value: function (event) {
-            //this._showMaterialPopup(event.detail.materialId);
             this._showMaterialPopup(event.detail);
         }
     },
@@ -96,32 +128,91 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
         enumerable:true,
         serializable: true
     },
-    
+
     _showMaterialPopup: {
-        enumerable: false,
-        value: function (materialObj) {
+        enumerable: false,
+        value: function (materialObj) {
 
-                        if(!this._materialPopup)
+            if(!this._materialPopup)
             {
                 this._materialPopup = Popup.create();
+                this._materialInfo.materialsLibraryRef = this;
                 this._materialPopup.content = this._materialInfo;
+                this._materialPopup.delegate = this;
                 this._materialPopup.modal = false;
                 this.eventManager.addEventListener("hideMaterialPopup", this, false);
                 this._materialPopup.addEventListener("show", this, false);
             }
             this._materialPopup.show();
 
-            materialID = materialObj.materialId;
-            this._materialInfo.loadMaterials(materialID,  materialObj.useSelection, materialObj.whichMaterial);
-        }
+            this._materialInfo.loadMaterials(materialObj.materialId,  materialObj.useSelection, materialObj.whichMaterial);
+        }
     },
 
     handleHideMaterialPopup: {
-        enumerable: false,
-        value: function (event) {
+        enumerable: false,
+        value: function (event) {
             if(this._materialPopup){
+//                console.log("hiding material popup");
+                this._materialInfo.destroy();
                 this._materialPopup.hide();
             }
-        }
+        }
+    },
+
+    duplicateMaterial: {
+        enumerable: false,
+        value: function (matCopyName) {
+//            console.log("Duplicate selected material");
+            var mat = MaterialsModel.getMaterial(this.materialId);
+            if(mat) {
+                var matCopy = mat.dup();
+                if(!matCopyName) {
+                    matCopyName = this.materialId + "_" + this.customMaterialsCounter++;
+    }
+                matCopy.setName(matCopyName);
+                MaterialsModel.addMaterial(matCopy);
+
+                var leaf = LeafNode.create();
+                leaf.id = matCopyName;
+                leaf.label = matCopyName;
+                leaf.treeNodeType = "leaf";
+                leaf.canDelete = true;
+                if(!this.customMaterialsBranch) {
+                    this.customMaterialsBranch = this.materialsController.branchControllers[2];
+                }
+                this.customMaterialsBranch.content.push(leaf);
+            }
+        }
+    },
+
+    deleteMaterial: {
+        enumerable: false,
+        value: function () {
+//            console.log("Delete selected material");
+            if(!this.customMaterialsBranch) {
+                this.customMaterialsBranch = this.materialsController.branchControllers[2];