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, 4 insertions, 4 deletions

diff --git a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
index 57f4bda3..2e0d97df 100644
--- a/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
+++ b/js/panels/css-panel/style-sheets-view.reel/style-sheets-view.js
@@ -75,7 +75,7 @@ exports.StyleSheetsView = Montage.create(Component, {
         },
         set: function(label) {
             if(label === this._documentName) { return false; }
-            
+
             this._documentName = label;
             this.needsDraw = true;
         }
@@ -147,7 +147,7 @@ exports.StyleSheetsView = Montage.create(Component, {
 
     /// App event handlers
     /// --------------------------------
-    
+
     handleStyleSheetsReady : {
         value: function(e) {
             this.documentName = this.stylesController.currentDocument.name;
@@ -183,7 +183,7 @@ exports.StyleSheetsView = Montage.create(Component, {
 
     /// Draw cycle
     /// --------------------------------
-    
+
     templateDidLoad : {
         value: function() {
             this.stylesController = this.application.ninja.stylesController;
@@ -206,7 +206,7 @@ exports.StyleSheetsView = Montage.create(Component, {
             if(this.height) {
                 this.styleSheetList.element.style.height = (this.height + this._resizedHeight) + "px";
             }
-            
+
             if(this.documentName && this.documentNameLabel) {
                 this.documentNameLabel.innerHTML = this.documentName;
                 this.documentNameLabel.classList.remove(this.noDocumentLabelClass);