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

diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 3fe39aa7..6de15490 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -28,11 +28,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 
-var Montage =           require("montage/core/core").Montage,
-    Component =         require("montage/ui/component").Component,
-    UndoManager =       require("montage/core/undo-manager").UndoManager,
-    AppData =           require("js/data/appdata").AppData,
-    Popup =             require("js/components/popup.reel").Popup;
+var Montage =       require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component,
+    UndoManager =   require("montage/core/undo-manager").UndoManager,
+    AppData =       require("js/data/appdata").AppData,
+    Popup =         require("js/components/popup.reel").Popup;
 
 var matrix = require("js/lib/math/matrix");
 var NjUtils = require("js/lib/NJUtils").NJUtils;
@@ -215,7 +215,7 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-        _workspaceMode: {
+    _workspaceMode: {
         value: null
     },
 
@@ -370,7 +370,7 @@ exports.Ninja = Montage.create(Component, {
             window.addEventListener("resize", this, false);
             //Prompting the user to make sure data was saved before closing Ninja
             window.onbeforeunload = function () {
-                return 'Are you sure you want to close Ninja? Any unsaved data will be lost.';
+                return 'Are you sure you want to close Ninja? Any unsaved data will be lost.';
             };
 
             this.eventManager.addEventListener("selectTool", this, false);
@@ -381,48 +381,48 @@ exports.Ninja = Montage.create(Component, {
             this.addPropertyChangeListener("appModel.debug", this.toggleDebug, false);
         }
     },
-    
-    
+
+
     ////////////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////////////
-        //TODO: Expand method to allow other browsers for preview
+    //TODO: Expand method to allow other browsers for preview
     executeChromePreview: {
-        value: function () {
-                //TODO: Make into proper component
-                this.saveOperationScreen = {};
-                this._saveOperationPopup = {};
-                //Show
-                this.saveOperationScreen.show = function (ctxt) {
-                        //
-                        ctxt._saveOperationPopup.blackout = document.createElement('div');
-                        ctxt._saveOperationPopup.blackout.style.width = '100%';
-                        ctxt._saveOperationPopup.blackout.style.height = '100%';
-                        ctxt._saveOperationPopup.blackout.style.background = 'rgba(0,0,0,0.8)'; //'-webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%)';
-                        ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout);
-                };
-                //Hide
-                this.saveOperationScreen.hide = function (ctxt) {
-                        ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout);
-                };
-                //
-                this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this);
-        }
-    },
-        ////////////////////////////////////////////////////////////////////
-        
-        //TODO: Make into proper component
-        _saveOperationPopup: {
-                value: null
-        },
-        //TODO: Make into proper component
-        saveOperationScreen: {
-                value: null
-        },
-        
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
-        
-        
+        value: function () {
+            //TODO: Make into proper component
+            this.saveOperationScreen = {};
+            this._saveOperationPopup = {};
+            //Show
+            this.saveOperationScreen.show = function (ctxt) {
+                //
+                ctxt._saveOperationPopup.blackout = document.createElement('div');
+                ctxt._saveOperationPopup.blackout.style.width = '100%';
+                ctxt._saveOperationPopup.blackout.style.height = '100%';
+                ctxt._saveOperationPopup.blackout.style.background = 'rgba(0,0,0,0.8)'; //'-webkit-radial-gradient(center, ellipse cover, rgba(0,0,0,.65) 0%, rgba(0,0,0,0.8) 80%)';
+                ctxt.application.ninja.popupManager.addPopup(ctxt._saveOperationPopup.blackout);
+            };
+            //Hide
+            this.saveOperationScreen.hide = function (ctxt) {
+                ctxt.application.ninja.popupManager.removePopup(ctxt._saveOperationPopup.blackout);
+            };
+            //
+            this.currentDocument.model.browserPreview('chrome', this.saveOperationScreen, this);
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+
+    //TODO: Make into proper component
+    _saveOperationPopup: {
+        value: null
+    },
+    //TODO: Make into proper component
+    saveOperationScreen: {
+        value: null
+    },
+
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+
+
     handleResize: {
         value: function() {
             this.stage.resizeCanvases = true;
@@ -444,14 +444,14 @@ exports.Ninja = Montage.create(Component, {
     _didDraw: {
         value: false
     },
-    
+
     didDraw: {
         value: function() {
 
             if(!this._didDraw) {
-                if (!this.application.ninja.coreIoApi.ioServiceDetected) {
-                        var check = this.application.ninja.coreIoApi.cloudAvailable();
-                }
+                if (!this.application.ninja.coreIoApi.ioServiceDetected) {
+                    var check = this.application.ninja.coreIoApi.cloudAvailable();
+                }
                 NJevent("appLoaded");
                 this._didDraw = true;
             }