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/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index ddccc3d5..0536f7eb 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -202,7 +202,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             }
         }
     },
-    
+
     pickerModel:{
         enumerable:false,
         writable:true,
@@ -210,25 +210,25 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
     },
 
     willDraw: {
-        enumerable: false,
-        value: function() {
+        enumerable: false,
+        value: function() {
 
-        }
+        }
     },
     draw: {
-        enumerable: false,
-        value: function() {
+        enumerable: false,
+        value: function() {
             this.filterVal.innerHTML = this.pickerModel.currentFilter;
 
             if(this.pickerModel.fatalError !== null){
                 this.error.innerHTML = this.pickerModel.fatalError;
             }
 
-        }
+        }
     },
     didDraw: {
-        enumerable: false,
-        value: function() {
+        enumerable: false,
+        value: function() {
 
             var that = this;
             this.iconList = null;
@@ -376,7 +376,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             //ready to show picker now
             this.element.style.visibility = "visible";
             this.element.focus();
-        }
+        }
     },
 
     updateAddressBar:{
@@ -388,7 +388,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                 addressBarEl.value = folderUri;
 
                 //update left drive selection
-                
+
             }
         }
     },