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

diff --git a/js/document/views/base.js b/js/document/views/base.js
index 18676d1f..14ee8e6c 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -30,66 +30,66 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ////////////////////////////////////////////////////////////////////////
 //
-var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component,
-        UrlParser = require("js/document/helpers/url-parser").UrlParser;
+var Montage =   require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component,
+    UrlParser = require("js/document/helpers/url-parser").UrlParser;
 ////////////////////////////////////////////////////////////////////////
-//      
+//
 exports.BaseDocumentView = Montage.create(Component, {
-        ////////////////////////////////////////////////////////////////////
-        //
-        hasTemplate: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    hasTemplate: {
         value: false
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        urlParser: {
+    //
+    urlParser: {
         value: UrlParser
     },
-        ////////////////////////////////////////////////////////////////////
-        //
-        _iframe: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    _iframe: {
         value: null
     },
     ////////////////////////////////////////////////////////////////////
-        //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view)
-        iframe: {
-                get: function() {return this._iframe;},
+    //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view)
+    iframe: {
+        get: function() {return this._iframe;},
         set: function(value) {this._iframe= value;}
     },
-        ////////////////////////////////////////////////////////////////////
-        //
-        show: {
+    ////////////////////////////////////////////////////////////////////
+    //
+    show: {
         value: function (callback) {
-                if (this.iframe) {
-                        this.iframe.style.display = 'block';
+            if (this.iframe) {
+                this.iframe.style.display = 'block';
                 this.iframe.style.opacity = 1;
                 this.toggleWebGlAnimation(true);
-                } else {
-                        console.log('Error: View has no iframe to show!');
-                }
-                //
-                if (callback) callback();
+            } else {
+                console.log('Error: View has no iframe to show!');
+            }
+            //
+            if (callback) callback();
         }
     },
     ////////////////////////////////////////////////////////////////////
-        //
-        hide: {
+    //
+    hide: {
         value: function (callback) {
-                if (this.iframe) {
-                        this.iframe.style.display = 'none';
+            if (this.iframe) {
+                this.iframe.style.display = 'none';
                 this.iframe.style.opacity = 0;
                 this.pauseVideos();
                 this.toggleWebGlAnimation(false);
-                } else {
-                        console.log('Error: View has no iframe to hide!');
-                }
-                //
-                if (callback) callback();
+            } else {
+                console.log('Error: View has no iframe to hide!');
+            }
+            //
+            if (callback) callback();
         }
     }
-        ////////////////////////////////////////////////////////////////////
-        ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////
 });
 ////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////