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/node_modules/montage/ui/native/input-number.reel/input-number.js b/node_modules/montage/ui/native/input-number.reel/input-number.js
index 33700b92..f0f88bb6 100644
--- a/node_modules/montage/ui/native/input-number.reel/input-number.js
+++ b/node_modules/montage/ui/native/input-number.reel/input-number.js
@@ -50,23 +50,23 @@ var InputNumber = exports.InputNumber = Montage.create(TextInput, {
 InputNumber.addAttributes(/** @lends module:"montage/ui/input-number.reel".InputNumber */{
 
 /**
-        The maximum value displayed but the number control.
-        @type {number}
-        @default null
+    The maximum value displayed but the number control.
+    @type {number}
+    @default null
 */
     max: {dataType: 'number'},
 
 /**
-        The minimum value displayed but the number control.
-        @type {number}
-        @default null
+    The minimum value displayed but the number control.
+    @type {number}
+    @default null
 */
     min: {dataType: 'number'},
 
 /**
-        The amount the number changes with each step.
-        @type {number}
-        @default null
+    The amount the number changes with each step.
+    @type {number}
+    @default null
 */
     step: null // number or 'any'
 });