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>
author: Valerio Virgillito 2012-07-09 14:35:44 -0700
committer: Valerio Virgillito 2012-07-09 14:35:44 -0700
commit: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree: 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage/ui/loading-panel.reel
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
2 files changed, 4 insertions, 4 deletions
diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
index 2b2391e3..11c28547 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.js b/node_modules/montage/ui/loading-panel.reel/loading-panel.js
index 4903e3eb..2a035c50 100755
--- a/node_modules/montage/ui/loading-panel.reel/loading-panel.js
+++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.js
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
 /**
-        @module "montage/ui/loading-panel.reel"
+    @module "montage/ui/loading-panel.reel"
 */
 var Montage = require("montage").Montage,
@@ -43,7 +43,7 @@ var Montage = require("montage").Montage,
 exports.LoadingPanel = Montage.create(Component, /** @lends module:montage/ui/loading-panel.LoadingPanel# */ {
 /**
-        The number of modules that are required to load.
+    The number of modules that are required to load.
 */
    requiredModuleCount: {
        enumerable: false,
@@ -51,7 +51,7 @@ exports.LoadingPanel = Montage.create(Component, /** @lends module:montage/ui/lo
    },
 /**
-        The number of modules that have been initialized.
+    The number of modules that have been initialized.
 */
    initializedModuleCount: {
        enumerable: false,
author	Valerio Virgillito	2012-07-09 14:35:44 -0700
committer	Valerio Virgillito	2012-07-09 14:35:44 -0700
commit	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch)
tree	3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage/ui/loading-panel.reel
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.html b/node_modules/montage/ui/loading-panel.reel/loading-panel.html index 2b2391e3..11c28547 100755 --- a/node_modules/montage/ui/loading-panel.reel/loading-panel.html +++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.html
@@ -1,4 +1,4 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility, Inc
4	All Rights Reserved.	4	All Rights Reserved.


diff --git a/node_modules/montage/ui/loading-panel.reel/loading-panel.js b/node_modules/montage/ui/loading-panel.reel/loading-panel.js index 4903e3eb..2a035c50 100755 --- a/node_modules/montage/ui/loading-panel.reel/loading-panel.js +++ b/node_modules/montage/ui/loading-panel.reel/loading-panel.js
@@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	29	</copyright> */
30		30
31	/**	31	/**
32	@module "montage/ui/loading-panel.reel"	32	@module "montage/ui/loading-panel.reel"
33	*/	33	*/
34		34
35	var Montage = require("montage").Montage,	35	var Montage = require("montage").Montage,
@@ -43,7 +43,7 @@ var Montage = require("montage").Montage,
43	exports.LoadingPanel = Montage.create(Component, /** @lends module:montage/ui/loading-panel.LoadingPanel# */ {	43	exports.LoadingPanel = Montage.create(Component, /** @lends module:montage/ui/loading-panel.LoadingPanel# */ {
44		44
45	/**	45	/**
46	The number of modules that are required to load.	46	The number of modules that are required to load.
47	*/	47	*/
48	requiredModuleCount: {	48	requiredModuleCount: {
49	enumerable: false,	49	enumerable: false,
@@ -51,7 +51,7 @@ exports.LoadingPanel = Montage.create(Component, /** @lends module:montage/ui/lo
51	},	51	},
52		52
53	/**	53	/**
54	The number of modules that have been initialized.	54	The number of modules that have been initialized.
55	*/	55	*/
56	initializedModuleCount: {	56	initializedModuleCount: {
57	enumerable: false,	57	enumerable: false,