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>

3 files changed, 278 insertions, 278 deletions

diff --git a/js/document/models/base.js b/js/document/models/base.js
index 97992324..0bc86627 100755
--- a/js/document/models/base.js
+++ b/js/document/models/base.js
@@ -30,63 +30,63 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =           require("montage/core/core").Montage,
-        Component =     require("montage/ui/component").Component,
-        NinjaPrompt =   require("js/components/prompt.reel").NinjaPrompt;
+var Montage =       require("montage/core/core").Montage,
+    Component =     require("montage/ui/component").Component,
+    NinjaPrompt =   require("js/components/prompt.reel").NinjaPrompt;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.BaseDocumentModel = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        _file: {
+    //
+    _file: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     file: {
         get: function() {return this._file;},
         set: function(value) {this._file = value;}
     },
-        ////////////////////////////////////////////////////////////////////
-        //
+    ////////////////////////////////////////////////////////////////////
+    //
     _isActive: {
         value: true
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     isActive: {
         get: function() {return this._isActive;},
         set: function(value) {this._isActive = value;}
     },
-        ////////////////////////////////////////////////////////////////////
-        //
+    ////////////////////////////////////////////////////////////////////
+    //
     _needsSave: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     needsSave: {
         get: function() {return this._needsSave;},
         set: function(value) {this._needsSave = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     _currentView: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     currentView: {
         get: function() {return this._currentView;},
         set: function(value) {this._currentView = value;}
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     _selection: {
         value: []
     },
@@ -105,18 +105,18 @@ exports.BaseDocumentModel = Montage.create(Component, {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
+    //
     parentContainer: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        views: {
+    //
+    views: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        libs: {
+    //
+    libs: {
         value: null
     },
 
@@ -133,233 +133,233 @@ exports.BaseDocumentModel = Montage.create(Component, {
             }
         },
     ////////////////////////////////////////////////////////////////////
-        //
-        switchViewTo: {
+    //
+    switchViewTo: {
         value: function (view) {
-                //
+            //
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //TODO: Add API to allow other browser support
-        browserPreview: {
+    //TODO: Add API to allow other browser support
+    browserPreview: {
         value: function (browser, screen, context) {
-                //Making call to show feedback screen
-                if (screen) screen.show(context);
-                //Generating URL for document
-                var url = this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1];
-                //TODO: Add logic to prompt user to save (all) before preview
-                this.saveAll(null,function (success) {
-                        //Making call to show feedback screen
-                        if (screen) screen.hide(context);
-                        //TODO: Add error handling logic
-                        if (!success) {
-                                console.log('Error!');
-                                return;
-                        }
-                        //Currently only supporting current browser (Chrome, obviously)
-                        switch (this.browser) {
-                                case 'chrome':
-                                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
-                                                window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
-                                        } else {
-                                                window.open(this.url);
-                                        }
-                                        break;
-                        default:
-                                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
-                                                window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
-                                        } else {
-                                                window.open(this.url);
-                                        }
-                                        break;
-                        }
-                }.bind({browser: browser, url: url, template: this.fileTemplate}));
+            //Making call to show feedback screen
+            if (screen) screen.show(context);
+            //Generating URL for document
+            var url = this.application.ninja.coreIoApi.rootUrl + this.file.uri.split(this.application.ninja.coreIoApi.cloudData.root)[1];
+            //TODO: Add logic to prompt user to save (all) before preview
+            this.saveAll(null,function (success) {
+                //Making call to show feedback screen
+                if (screen) screen.hide(context);
+                //TODO: Add error handling logic
+                if (!success) {
+                    console.log('Error!');
+                    return;
+                }
+                //Currently only supporting current browser (Chrome, obviously)
+                switch (this.browser) {
+                    case 'chrome':
+                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
+                            window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
+                        } else {
+                            window.open(this.url);
+                        }
+                        break;
+                    default:
+                        if (this.template && (this.template.type === 'banner' || this.template.type === 'animation')) {
+                            window.open('/js/document/templates/preview/banner.html?width='+this.template.size.width+'&height='+this.template.size.height+'&url='+this.url);
+                        } else {
+                            window.open(this.url);
+                        }
+                        break;
+                }
+            }.bind({browser: browser, url: url, template: this.fileTemplate}));
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //Gets all stylesheets in document
-        getStyleSheets: {
-                value: function () {
-                        //Array to store styles (style and link tags)
-                        var styles = [];
-                //Looping through document sytles
-                for (var k in this.views.design.iframe.contentWindow.document.styleSheets) {
-                        //Check for styles to has proper propeties
-                        if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode && this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute) {
+    //Gets all stylesheets in document
+    getStyleSheets: {
+        value: function () {
+            //Array to store styles (style and link tags)
+            var styles = [];
+            //Looping through document sytles
+            for (var k in this.views.design.iframe.contentWindow.document.styleSheets) {
+                //Check for styles to has proper propeties
+                if (this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode && this.views.design.iframe.contentWindow.document.styleSheets[k].ownerNode.getAttribute) {