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 /js/panels/PanelContainer.reel
parent: c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent: 40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download: ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz
2 files changed, 12 insertions, 12 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index c84315d3..77bb23db 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
 Copyright (c) 2012, Motorola Mobility, Inc
 All Rights Reserved.
@@ -149,10 +149,10 @@ POSSIBILITY OF SUCH DAMAGE.
        }
    </script>
-        </head>
+    </head>
 <body>
    <section data-montage-id="panelContainer">
-                <article id="panels" class="panels">
+        <article id="panels" class="panels">
            <article data-montage-id="panel_0"></article>
            <article data-montage-id="panel_1"></article>
            <article data-montage-id="panel_2"></article>
@@ -161,7 +161,7 @@ POSSIBILITY OF SUCH DAMAGE.
            <article data-montage-id="panel_5"></article>
            <article data-montage-id="panel_6"></article>
            <article data-montage-id="panel_7"></article>
-                </article>
+        </article>
    </section>
 </body>
 </html>
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index 6718d104..07203088 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -27,13 +27,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> */
- 
 /*
 Panel Container - A container for other panels
 */
 var Montage         = require("montage/core/core").Montage,
    Component       = require("montage/ui/component").Component;
- 
 exports.PanelContainer = Montage.create(Component, {
    panelSplitter: {
@@ -167,19 +167,19 @@ exports.PanelContainer = Montage.create(Component, {
            this.application.localStorage.setItem("panels", this.currentPanelState);
        }
    },
- 
    prepareForDraw: {
        value: function() {
            window.addEventListener("resize", this, false);
        }
    },
- 
    handlePanelResizing: {
        value: function(e) {
            this._setPanelsSizes(e.target);
        }
    },
-     
    handleResize: {
         value: function(e) {
            this._redrawPanels(null, true);
@@ -220,7 +220,7 @@ exports.PanelContainer = Montage.create(Component, {
        }
    },
- 
    _setPanelsSizes: {
        value: function(panelActivated) {
            var availablePanels = this.panelsAvailable();
@@ -283,7 +283,7 @@ exports.PanelContainer = Montage.create(Component, {
            }
        }
    },
- 
    handleAction: {
        value: function(e) {
            var unlockPanels = true;
@@ -315,5 +315,5 @@ exports.PanelContainer = Montage.create(Component, {
            }
        }
    }
- 
 });
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 /js/panels/PanelContainer.reel
parent	c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff)
parent	40c6eb2c06b34f65a74d59ef9687251952858bab (diff)
download	ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index c84315d3..77bb23db 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.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.
@@ -149,10 +149,10 @@ POSSIBILITY OF SUCH DAMAGE.
149	}	149	}
150	</script>	150	</script>
151		151
152	</head>	152	</head>
153	<body>	153	<body>
154	<section data-montage-id="panelContainer">	154	<section data-montage-id="panelContainer">
155	<article id="panels" class="panels">	155	<article id="panels" class="panels">
156	<article data-montage-id="panel_0"></article>	156	<article data-montage-id="panel_0"></article>
157	<article data-montage-id="panel_1"></article>	157	<article data-montage-id="panel_1"></article>
158	<article data-montage-id="panel_2"></article>	158	<article data-montage-id="panel_2"></article>
@@ -161,7 +161,7 @@ POSSIBILITY OF SUCH DAMAGE.
161	<article data-montage-id="panel_5"></article>	161	<article data-montage-id="panel_5"></article>
162	<article data-montage-id="panel_6"></article>	162	<article data-montage-id="panel_6"></article>
163	<article data-montage-id="panel_7"></article>	163	<article data-montage-id="panel_7"></article>
164	</article>	164	</article>
165	</section>	165	</section>
166	</body>	166	</body>
167	</html>	167	</html>


diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js index 6718d104..07203088 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -27,13 +27,13 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE	27	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.	28	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	29	</copyright> */
30		30
31	/*	31	/*
32	Panel Container - A container for other panels	32	Panel Container - A container for other panels
33	*/	33	*/
34	var Montage = require("montage/core/core").Montage,	34	var Montage = require("montage/core/core").Montage,
35	Component = require("montage/ui/component").Component;	35	Component = require("montage/ui/component").Component;
36		36
37	exports.PanelContainer = Montage.create(Component, {	37	exports.PanelContainer = Montage.create(Component, {
38		38
39	panelSplitter: {	39	panelSplitter: {
@@ -167,19 +167,19 @@ exports.PanelContainer = Montage.create(Component, {
167	this.application.localStorage.setItem("panels", this.currentPanelState);	167	this.application.localStorage.setItem("panels", this.currentPanelState);
168	}	168	}
169	},	169	},
170		170
171	prepareForDraw: {	171	prepareForDraw: {
172	value: function() {	172	value: function() {
173	window.addEventListener("resize", this, false);	173	window.addEventListener("resize", this, false);
174	}	174	}
175	},	175	},
176		176
177	handlePanelResizing: {	177	handlePanelResizing: {
178	value: function(e) {	178	value: function(e) {
179	this._setPanelsSizes(e.target);	179	this._setPanelsSizes(e.target);
180	}	180	}
181	},	181	},
182		182
183	handleResize: {	183	handleResize: {
184	value: function(e) {	184	value: function(e) {
185	this._redrawPanels(null, true);	185	this._redrawPanels(null, true);
@@ -220,7 +220,7 @@ exports.PanelContainer = Montage.create(Component, {
220		220
221	}	221	}
222	},	222	},
223		223
224	_setPanelsSizes: {	224	_setPanelsSizes: {
225	value: function(panelActivated) {	225	value: function(panelActivated) {
226	var availablePanels = this.panelsAvailable();	226	var availablePanels = this.panelsAvailable();
@@ -283,7 +283,7 @@ exports.PanelContainer = Montage.create(Component, {
283	}	283	}
284	}	284	}
285	},	285	},
286		286
287	handleAction: {	287	handleAction: {
288	value: function(e) {	288	value: function(e) {
289	var unlockPanels = true;	289	var unlockPanels = true;
@@ -315,5 +315,5 @@ exports.PanelContainer = Montage.create(Component, {
315	}	315	}
316	}	316	}
317	}	317	}
318		318
319	});	319	});