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

diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 44598ed7..970dc453 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -28,31 +28,31 @@ 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,
+var Montage =   require("montage/core/core").Montage,
     ShapeTool = require("js/tools/ShapeTool").ShapeTool,
-    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
+    ShapesController =  require("js/controllers/elements/shapes-controller").ShapesController;
 
 var Circle = require("js/lib/geom/circle").Circle;
 var MaterialsModel = require("js/models/materials-model").MaterialsModel;
 
 exports.OvalTool = Montage.create(ShapeTool, {
 
-        _toolID: { value: "ovalTool" },
-        _imageID: { value: "ovalToolImg" },
-        _toolImageClass: { value: "ovalToolUp" },
-        _selectedToolImageClass: { value: "ovalToolDown" },
-        _toolTipText: { value: "Oval Tool (O)" },
+    _toolID: { value: "ovalTool" },
+    _imageID: { value: "ovalToolImg" },
+    _toolImageClass: { value: "ovalToolUp" },
+    _selectedToolImageClass: { value: "ovalToolDown" },
+    _toolTipText: { value: "Oval Tool (O)" },
     _selectedToolClass:{value:"ovalToolSpecificProperties"},
     _ovalView : { value: null, writable: true},
 
     RenderShape: {
-                value: function (w, h, planeMat, midPt, canvas)
+        value: function (w, h, planeMat, midPt, canvas)
         {
             if( (Math.floor(w) === 0) || (Math.floor(h) === 0) )
             {
                 return;
             }
-            
+
             var left = Math.round(midPt[0] - 0.5*w);
             var top = Math.round(midPt[1] - 0.5*h);