diff options
author | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-06-19 10:25:16 -0700 |
commit | 4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch) | |
tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |
parent | 616b31a644ee221edcbc19f821b2194e8edf9fad (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel/materials-library-panel.js')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | 13 |
1 files changed, 8 insertions, 5 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 c600fd0d..cf0d4e93 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 | |||
@@ -51,14 +51,15 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
51 | 51 | ||
52 | handleNodeActivation: { | 52 | handleNodeActivation: { |
53 | value:function(obj) { | 53 | value:function(obj) { |
54 | this._showMaterialPopup(obj.id); | 54 | this._showMaterialPopup({ materialId: obj.id }); |
55 | } | 55 | } |
56 | }, | 56 | }, |
57 | 57 | ||
58 | handleShowMaterialPopup: { | 58 | handleShowMaterialPopup: { |
59 | enumerable: false, | 59 | enumerable: false, |
60 | value: function (event) { | 60 | value: function (event) { |
61 | this._showMaterialPopup(event.detail.materialId); | 61 | //this._showMaterialPopup(event.detail.materialId); |
62 | this._showMaterialPopup(event.detail); | ||
62 | } | 63 | } |
63 | }, | 64 | }, |
64 | 65 | ||
@@ -74,9 +75,9 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
74 | 75 | ||
75 | _showMaterialPopup: { | 76 | _showMaterialPopup: { |
76 | enumerable: false, | 77 | enumerable: false, |
77 | value: function (materialID) { | 78 | value: function (materialObj) { |
78 | 79 | ||
79 | if(!this._materialPopup) | 80 | if(!this._materialPopup) |
80 | { | 81 | { |
81 | this._materialPopup = Popup.create(); | 82 | this._materialPopup = Popup.create(); |
82 | this._materialPopup.content = this._materialInfo; | 83 | this._materialPopup.content = this._materialInfo; |
@@ -85,7 +86,9 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
85 | this._materialPopup.addEventListener("show", this, false); | 86 | this._materialPopup.addEventListener("show", this, false); |
86 | } | 87 | } |
87 | this._materialPopup.show(); | 88 | this._materialPopup.show(); |
88 | this._materialInfo.loadMaterials(materialID); | 89 | |
90 | materialID = materialObj.materialId; | ||
91 | this._materialInfo.loadMaterials(materialID, materialObj.useSelection, materialObj.whichMaterial); | ||
89 | } | 92 | } |
90 | }, | 93 | }, |
91 | 94 | ||