Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal

Conflicts:
	js/components/gradientpicker.reel/gradientpicker.js
	js/components/tools-properties/text-properties.reel/text-properties.js
	js/document/views/base.js
	js/document/views/design.js
	js/helper-classes/3D/StageLine.js
	js/helper-classes/3D/draw-utils.js
	js/lib/drawing/world.js
	js/lib/geom/circle.js
	js/lib/geom/line.js
	js/lib/geom/rectangle.js
	js/lib/geom/shape-primitive.js
	js/lib/rdge/materials/bump-metal-material.js
	js/lib/rdge/materials/flag-material.js
	js/lib/rdge/materials/fly-material.js
	js/lib/rdge/materials/julia-material.js
	js/lib/rdge/materials/keleidoscope-material.js
	js/lib/rdge/materials/mandel-material.js
	js/lib/rdge/materials/material.js
	js/lib/rdge/materials/plasma-material.js
	js/lib/rdge/materials/pulse-material.js
	js/lib/rdge/materials/radial-gradient-material.js
	js/lib/rdge/materials/taper-material.js
	js/lib/rdge/materials/twist-vert-material.js
	js/lib/rdge/materials/water-material.js
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
	js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
	js/panels/Materials/materials-popup.reel/materials-popup.html
	js/panels/Materials/materials-popup.reel/materials-popup.js
	js/tools/LineTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

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, {
     },
 
     _hasFocus: {
-        enumerable: false,
-        value: false
+        enumerable: false,
+        value: false
     },
 
     didCreate: {
@@ -128,12 +128,12 @@ 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;
@@ -146,18 +146,18 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
             this._materialPopup.show();
 
             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: {
@@ -169,7 +169,7 @@ exports.MaterialsLibraryPanel = Montage.create(Component, {
                 var matCopy = mat.dup();
                 if(!matCopyName) {
                     matCopyName = this.materialId + "_" + this.customMaterialsCounter++;
-                }
+    }
                 matCopy.setName(matCopyName);
                 MaterialsModel.addMaterial(matCopy);