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

diff --git a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
index e214a49b..a6a655d5 100755
--- a/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
+++ b/js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.js
@@ -49,25 +49,25 @@ exports.ComputedStyleSubPanel = Montage.create(Component, {
     },
     // prepareForDraw : {
     //    value: function() {
-    //             
+    //
     //    }
     // },
     willDraw : {
         value: function() {
             if(this._declaration) {
-            
+
                 var group = this.staticGroupingMap[this._group],
                     matchedInGroup, elementList;
-            
+
                 if(this._group === 'all' && !group) {
                     group = this.staticGroupingMap['all'] = nj.toArray(this._declaration).sort();
                 }
-            
+
                 ///// Filter group to show only the styles that match search filter
                 matchedInGroup = group.filter(function(item) {
                     return (item.indexOf(this._filter) > -1);
                 }, this);
-                
+
                 this._elementList = matchedInGroup.map(function(propName) {
                     var propEl = nj.make('dt'),
                         valEl  = nj.make('dd'),
@@ -75,20 +75,20 @@ exports.ComputedStyleSubPanel = Montage.create(Component, {
 
                     propEl.appendChild(nj.textNode(propName));
                     propEl.title = propName;
-                    
+
                     valEl.appendChild(nj.textNode(this._declaration.getPropertyValue(propName)));
                     valEl.title = this._declaration.getPropertyValue(propName);
-                    
+
                     contEl.appendChild(propEl);
                     contEl.appendChild(valEl);
-                
+
                     return contEl;
                 }, this);
-            
+
                 /*if(matchedInGroup.length) {
-                
+
                 } else {
-                
+
                 }*/
             }
         }
@@ -101,7 +101,7 @@ exports.ComputedStyleSubPanel = Montage.create(Component, {
                 ///// Append style elements to the list container
                 this._elementList.forEach(function(el) {
                     this.computedListEl.appendChild(el);
-                }, this);   
+                }, this);
             }
         }
     },
@@ -138,7 +138,7 @@ exports.ComputedStyleSubPanel = Montage.create(Component, {
                 ///// Get computed style of passed in node
                 declaration = this._declaration = source.ownerDocument.defaultView.getComputedStyle(source);
             }
-            
+
             this.needsDraw = true;
         }
     },
@@ -194,7 +194,7 @@ exports.ComputedStyleSubPanel = Montage.create(Component, {
             'dimensions' : [
                 'width', 'height', 'top', 'right', 'bottom', 'left',
                 'padding-top', 'padding-right', 'padding-bottom', 'padding-left',
-                'margin-top', 'margin-right', 'margin-bottom', 'margin-left', 
+                'margin-top', 'margin-right', 'margin-bottom', 'margin-left',
                 'border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width'
             ],
             'border' : [
@@ -203,7 +203,7 @@ exports.ComputedStyleSubPanel = Montage.create(Component, {
                 'border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style'
             ],
             'font' : [
-                'font-family', 'font-size', 'font-weight', 'font-style', 'color', 'text-transform', 
+                'font-family', 'font-size', 'font-weight', 'font-style', 'color', 'text-transform',
                 'text-decoration', 'letter-spacing', 'word-spacing', 'line-height', 'text-align',
                 'vertical-align', 'direction'
             ],