aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.js')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js22
1 files changed, 11 insertions, 11 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 d6df8229..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
@@ -62,8 +62,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
62 }, 62 },
63 63
64 _hasFocus: { 64 _hasFocus: {
65 enumerable: false, 65 enumerable: false,
66 value: false 66 value: false
67 }, 67 },
68 68
69 didCreate: { 69 didCreate: {
@@ -128,12 +128,12 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
128 enumerable:true, 128 enumerable:true,
129 serializable: true 129 serializable: true
130 }, 130 },
131 131
132 _showMaterialPopup: { 132 _showMaterialPopup: {
133 enumerable: false, 133 enumerable: false,
134 value: function (materialObj) { 134 value: function (materialObj) {
135 135
136 if(!this._materialPopup) 136 if(!this._materialPopup)
137 { 137 {
138 this._materialPopup = Popup.create(); 138 this._materialPopup = Popup.create();
139 this._materialInfo.materialsLibraryRef = this; 139 this._materialInfo.materialsLibraryRef = this;
@@ -146,18 +146,18 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
146 this._materialPopup.show(); 146 this._materialPopup.show();
147 147
148 this._materialInfo.loadMaterials(materialObj.materialId, materialObj.useSelection, materialObj.whichMaterial); 148 this._materialInfo.loadMaterials(materialObj.materialId, materialObj.useSelection, materialObj.whichMaterial);
149 } 149 }
150 }, 150 },
151 151
152 handleHideMaterialPopup: { 152 handleHideMaterialPopup: {
153 enumerable: false, 153 enumerable: false,
154 value: function (event) { 154 value: function (event) {
155 if(this._materialPopup){ 155 if(this._materialPopup){
156// console.log("hiding material popup"); 156// console.log("hiding material popup");
157 this._materialInfo.destroy(); 157 this._materialInfo.destroy();
158 this._materialPopup.hide(); 158 this._materialPopup.hide();
159 } 159 }
160 } 160 }
161 }, 161 },
162 162
163 duplicateMaterial: { 163 duplicateMaterial: {
@@ -169,7 +169,7 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
169 var matCopy = mat.dup(); 169 var matCopy = mat.dup();
170 if(!matCopyName) { 170 if(!matCopyName) {
171 matCopyName = this.materialId + "_" + this.customMaterialsCounter++; 171 matCopyName = this.materialId + "_" + this.customMaterialsCounter++;
172 } 172 }
173 matCopy.setName(matCopyName); 173 matCopy.setName(matCopyName);
174 MaterialsModel.addMaterial(matCopy); 174 MaterialsModel.addMaterial(matCopy);
175 175