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

diff --git a/js/panels/Project/ProjectPanel.js b/js/panels/Project/ProjectPanel.js
index 5dcba3e7..35ba0a2f 100755
--- a/js/panels/Project/ProjectPanel.js
+++ b/js/panels/Project/ProjectPanel.js
@@ -29,12 +29,12 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
 var Montage = require("montage/core/core").Montage,
-        PanelBase =             require("js/panels/PanelBase").PanelBase,
-        ProjectPanelBase =      require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase;
+    PanelBase =         require("js/panels/PanelBase").PanelBase,
+    ProjectPanelBase =  require("js/panels/Project/ProjectPanelBase.reel").ProjectPanelBase;
 
 exports.ProjectPanel = Montage.create(PanelBase, {
-   
-        id: {value: "projectPanel", writable: true, enumerable: true, configurable: true},
+
+    id: {value: "projectPanel", writable: true, enumerable: true, configurable: true},
     panelName: {value: "Project/Assets", writable: true, enumerable: true, configurable: true},
     panelHeaderID: {value: "projectPanelHeader", writable: true, enumerable: true, configurable: true},
     disclosureIconID: {value: "projectPanelDisclosureIcon", writable: true, enumerable: true, configurable: true},
@@ -42,9 +42,9 @@ exports.ProjectPanel = Montage.create(PanelBase, {
     panelContentID: {value: "projectPanelContent", writable: true, enumerable: true, configurable: true},
 
     init: {
-        enumerable: true,
-        value: function() {
-                        //Creating panel container and panel
+        enumerable: true,
+        value: function() {
+            //Creating panel container and panel
             this.minHeight = 350;
             this.defaultHeight = 350;
             this.contentHeight = 395;
@@ -57,7 +57,7 @@ exports.ProjectPanel = Montage.create(PanelBase, {
             this._projectPanelBase.element = ppContainer;
             //Adding container to the parent
             this.content = this._projectPanelBase;
-                //Drawing panel
+            //Drawing panel
             this._projectPanelBase.needsDraw = true;
             */