aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials/materials-library-panel.reel
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:52:06 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch)
tree8f0f55557bd0c47a84e49c1977c950645d284607 /js/panels/Materials/materials-library-panel.reel
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz
Expand tabs
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.html26
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js18
2 files changed, 22 insertions, 22 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 f77d3186..3204ce50 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
@@ -29,16 +29,16 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29POSSIBILITY OF SUCH DAMAGE. 29POSSIBILITY OF SUCH DAMAGE.
30</copyright> --> 30</copyright> -->
31<html lang="en"> 31<html lang="en">
32 <head> 32 <head>
33 <meta http-equiv="content-type" content="text/html; charset=utf-8" /> 33 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
34 <link rel="stylesheet" type="text/css" href="materials-library-panel.css"> 34 <link rel="stylesheet" type="text/css" href="materials-library-panel.css">
35 <script type="text/montage-serialization"> 35 <script type="text/montage-serialization">
36 { 36 {
37 "addButton": { 37 "addButton": {
38 "prototype": "montage/ui/button.reel", 38 "prototype": "montage/ui/button.reel",
39 "properties": { 39 "properties": {
40 "element": {"#": "ml_add_btn"}, 40 "element": {"#": "ml_add_btn"},
41 "enabled": false 41 "enabled": false
42 }, 42 },
43 "listeners": [ 43 "listeners": [
44 { 44 {
@@ -51,7 +51,7 @@ POSSIBILITY OF SUCH DAMAGE.
51 "prototype": "montage/ui/button.reel", 51 "prototype": "montage/ui/button.reel",
52 "properties": { 52 "properties": {
53 "element": {"#": "ml_copy_btn"}, 53 "element": {"#": "ml_copy_btn"},
54 "enabled": false 54 "enabled": false
55 }, 55 },
56 "listeners": [ 56 "listeners": [
57 { 57 {
@@ -64,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE.
64 "prototype": "montage/ui/button.reel", 64 "prototype": "montage/ui/button.reel",
65 "properties": { 65 "properties": {
66 "element": {"#": "ml_delete_btn"}, 66 "element": {"#": "ml_delete_btn"},
67 "enabled": false 67 "enabled": false
68 }, 68 },
69 "listeners": [ 69 "listeners": [
70 { 70 {
@@ -109,13 +109,13 @@ POSSIBILITY OF SUCH DAMAGE.
109 "_materialInfo": {"@": "materialInfo"} 109 "_materialInfo": {"@": "materialInfo"}
110 } 110 }
111 } 111 }
112 } 112 }
113 </script> 113 </script>
114 114
115 </head> 115 </head>
116 <body> 116 <body>
117 117
118 <div data-montage-id="materials_library_panel" class="materials_library_panel"> 118 <div data-montage-id="materials_library_panel" class="materials_library_panel">
119 <section data-montage-id="ml_tree_holder" class="animationsLibrary"> 119 <section data-montage-id="ml_tree_holder" class="animationsLibrary">
120 <div data-montage-id="materials_library_tree"></div> 120 <div data-montage-id="materials_library_tree"></div>
121 </section> 121 </section>
@@ -125,7 +125,7 @@ POSSIBILITY OF SUCH DAMAGE.
125 <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button> 125 <button data-montage-id="ml_copy_btn" class="nj-skinned">Copy</button>
126 <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button> 126 <button data-montage-id="ml_delete_btn" class="nj-skinned">Delete</button>
127 </div> 127 </div>
128 </div> 128 </div>
129 129
130 </body> 130 </body>
131</html> 131</html>
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..1cf3cec7 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
@@ -40,8 +40,8 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
40 }, 40 },
41 41
42 _hasFocus: { 42 _hasFocus: {
43 enumerable: false, 43 enumerable: false,
44 value: false 44 value: false
45 }, 45 },
46 46
47 didCreate: { 47 didCreate: {
@@ -98,10 +98,10 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
98 }, 98 },
99 99
100 _showMaterialPopup: { 100 _showMaterialPopup: {
101 enumerable: false, 101 enumerable: false,
102 value: function (materialObj) { 102 value: function (materialObj) {
103 103
104 if(!this._materialPopup) 104 if(!this._materialPopup)
105 { 105 {
106 this._materialPopup = Popup.create(); 106 this._materialPopup = Popup.create();
107 this._materialPopup.content = this._materialInfo; 107 this._materialPopup.content = this._materialInfo;
@@ -113,15 +113,15 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
113 113
114 materialID = materialObj.materialId; 114 materialID = materialObj.materialId;
115 this._materialInfo.loadMaterials(materialID, materialObj.useSelection, materialObj.whichMaterial); 115 this._materialInfo.loadMaterials(materialID, materialObj.useSelection, materialObj.whichMaterial);
116 } 116 }
117 }, 117 },
118 118
119 handleHideMaterialPopup: { 119 handleHideMaterialPopup: {
120 enumerable: false, 120 enumerable: false,
121 value: function (event) { 121 value: function (event) {
122 if(this._materialPopup){ 122 if(this._materialPopup){
123 this._materialPopup.hide(); 123 this._materialPopup.hide();
124 } 124 }
125 } 125 }
126 } 126 }
127}); 127});
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 12:03:34 +0000