aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:53:10 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit04343eda8c2f870b0da55cfdc8003c99fe1cc4de (patch)
tree0a6048889b65bb16ff58822e55bc1346e9eb07bd /js/panels/Materials
parent648ee61ae84216d0236e0dbc211addc13b2cfa3a (diff)
downloadninja-04343eda8c2f870b0da55cfdc8003c99fe1cc4de.tar.gz
Remove trailing spaces
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js2
-rwxr-xr-xjs/panels/Materials/materials-popup.reel/materials-popup.js12
2 files changed, 7 insertions, 7 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 1cf3cec7..98a87b07 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
@@ -96,7 +96,7 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
96 enumerable:true, 96 enumerable:true,
97 serializable: true 97 serializable: true
98 }, 98 },
99 99
100 _showMaterialPopup: { 100 _showMaterialPopup: {
101 enumerable: false, 101 enumerable: false,
102 value: function (materialObj) { 102 value: function (materialObj) {
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index cecb0a71..12a86c47 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -202,7 +202,7 @@ exports.MaterialsPopup = Montage.create(Component, {
202 var ch = propLabel[ propLabel.length - 1]; 202 var ch = propLabel[ propLabel.length - 1];
203 if (ch == ':') 203 if (ch == ':')
204 propLabel = propLabel.substr(0, propLabel.length - 1); 204 propLabel = propLabel.substr(0, propLabel.length - 1);
205 205
206 var index; 206 var index;
207 var nProps = this._propLabels.length; 207 var nProps = this._propLabels.length;
208 for (var i=0; i<nProps; i++) 208 for (var i=0; i<nProps; i++)
@@ -390,7 +390,7 @@ exports.MaterialsPopup = Montage.create(Component, {
390 material = MaterialsModel.getMaterial( materialID ); 390 material = MaterialsModel.getMaterial( materialID );
391 } 391 }
392 } 392 }
393 393
394 if (material) 394 if (material)
395 { 395 {
396 this._material = material; 396 this._material = material;
@@ -510,7 +510,7 @@ exports.MaterialsPopup = Montage.create(Component, {
510 return obj; 510 return obj;
511 } 511 }
512 }, 512 },
513 513
514 createCheckboxData: 514 createCheckboxData:
515 { 515 {
516 value: function( label, value ) 516 value: function( label, value )
@@ -554,7 +554,7 @@ exports.MaterialsPopup = Montage.create(Component, {
554 { 554 {
555 value: function( dimen, label, value ) 555 value: function( dimen, label, value )
556 { 556 {
557 var obj = 557 var obj =
558 { 558 {
559 "label": label, 559 "label": label,
560 "description": "a vector", 560 "description": "a vector",
@@ -798,12 +798,12 @@ exports.MaterialsPopup = Montage.create(Component, {
798 serializable: true, 798 serializable: true,
799 value: null 799 value: null
800 }, 800 },
801 801
802 _materialsData: { 802 _materialsData: {
803 enumerable: true, 803 enumerable: true,
804 serializable: true, 804 serializable: true,
805 value: [] 805 value: []
806 806
807 }, 807 },
808 808
809 materialsData: { 809 materialsData: {