Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts: manifest.json
author: John Mayhew 2012-07-09 17:28:24 -0700
committer: John Mayhew 2012-07-09 17:28:24 -0700
commit: 770bcb52422742ff741a88a75ecefbeb90bc9247 (patch)
tree: 64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/PanelContainer.reel
parent: 8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff)
parent: 2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff)
download: ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz
2 files changed, 36 insertions, 34 deletions
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index c84315d3..f98f9970 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -1,25 +1,26 @@
-<!DOCTYPE html>
+<!doctype html>
 <!-- <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+  this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+* Redistributions in binary form must reproduce the above copyright notice,
-    documentation and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
-  - Neither the name of Motorola Mobility nor the names of its contributors
+  and/or other materials provided with the distribution.
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -149,10 +150,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 +162,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..38170a8f 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -1,24 +1,25 @@
 /* <copyright>
-Copyright (c) 2012, Motorola Mobility, Inc
+Copyright (c) 2012, Motorola Mobility LLC.
 All Rights Reserved.
-BSD License.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-  - Redistributions of source code must retain the above copyright notice,
+* Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+  this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
+* Redistributions in binary form must reproduce the above copyright notice,
-    documentation and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
-  - Neither the name of Motorola Mobility nor the names of its contributors
+  and/or other materials provided with the distribution.
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -27,13 +28,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 +168,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 +221,7 @@ exports.PanelContainer = Montage.create(Component, {
        }
    },
- 
    _setPanelsSizes: {
        value: function(panelActivated) {
            var availablePanels = this.panelsAvailable();
@@ -283,7 +284,7 @@ exports.PanelContainer = Montage.create(Component, {
            }
        }
    },
- 
    handleAction: {
        value: function(e) {
            var unlockPanels = true;
@@ -315,5 +316,5 @@ exports.PanelContainer = Montage.create(Component, {
            }
        }
    }
- 
 });
author	John Mayhew	2012-07-09 17:28:24 -0700
committer	John Mayhew	2012-07-09 17:28:24 -0700
commit	770bcb52422742ff741a88a75ecefbeb90bc9247 (patch)
tree	64cb3e09a8daeb340261dd7f3869c73f7b90b643 /js/panels/PanelContainer.reel
parent	8c5ecaf90062f9e030386f338bdc19fd62b826c8 (diff)
parent	2b2b5fbb4b6a786daa4e9d4ee9eba9ac78924842 (diff)
download	ninja-770bcb52422742ff741a88a75ecefbeb90bc9247.tar.gz

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html index c84315d3..f98f9970 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.html +++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -1,25 +1,26 @@
1	<!DOCTYPE html>	1	<!doctype html>
2	<!-- <copyright>	2	<!-- <copyright>
3	Copyright (c) 2012, Motorola Mobility, Inc	3	Copyright (c) 2012, Motorola Mobility LLC.
4	All Rights Reserved.	4	All Rights Reserved.
5	BSD License.
6		5
7	Redistribution and use in source and binary forms, with or without	6	Redistribution and use in source and binary forms, with or without
8	modification, are permitted provided that the following conditions are met:	7	modification, are permitted provided that the following conditions are met:
9		8
10	- Redistributions of source code must retain the above copyright notice,	9	* Redistributions of source code must retain the above copyright notice,
11	this list of conditions and the following disclaimer.	10	this list of conditions and the following disclaimer.
12	- Redistributions in binary form must reproduce the above copyright	11
13	notice, this list of conditions and the following disclaimer in the	12	* Redistributions in binary form must reproduce the above copyright notice,
14	documentation and/or other materials provided with the distribution.	13	this list of conditions and the following disclaimer in the documentation
15	- Neither the name of Motorola Mobility nor the names of its contributors	14	and/or other materials provided with the distribution.
16	may be used to endorse or promote products derived from this software	15
17	without specific prior written permission.	16	* Neither the name of Motorola Mobility LLC nor the names of its
		17	contributors may be used to endorse or promote products derived from this
		18	software without specific prior written permission.
18		19
19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	20	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	21	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	22	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	23	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	24	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	25	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	26	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -149,10 +150,10 @@ POSSIBILITY OF SUCH DAMAGE.
149	}	150	}
150	</script>	151	</script>
151		152
152	</head>	153	</head>
153	<body>	154	<body>
154	<section data-montage-id="panelContainer">	155	<section data-montage-id="panelContainer">
155	<article id="panels" class="panels">	156	<article id="panels" class="panels">
156	<article data-montage-id="panel_0"></article>	157	<article data-montage-id="panel_0"></article>
157	<article data-montage-id="panel_1"></article>	158	<article data-montage-id="panel_1"></article>
158	<article data-montage-id="panel_2"></article>	159	<article data-montage-id="panel_2"></article>
@@ -161,7 +162,7 @@ POSSIBILITY OF SUCH DAMAGE.
161	<article data-montage-id="panel_5"></article>	162	<article data-montage-id="panel_5"></article>
162	<article data-montage-id="panel_6"></article>	163	<article data-montage-id="panel_6"></article>
163	<article data-montage-id="panel_7"></article>	164	<article data-montage-id="panel_7"></article>
164	</article>	165	</article>
165	</section>	166	</section>
166	</body>	167	</body>
167	</html>	168	</html>


diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js index 6718d104..38170a8f 100755 --- a/js/panels/PanelContainer.reel/PanelContainer.js +++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -1,24 +1,25 @@
1	/* <copyright>	1	/* <copyright>
2	Copyright (c) 2012, Motorola Mobility, Inc	2	Copyright (c) 2012, Motorola Mobility LLC.
3	All Rights Reserved.	3	All Rights Reserved.
4	BSD License.
5		4
6	Redistribution and use in source and binary forms, with or without	5	Redistribution and use in source and binary forms, with or without
7	modification, are permitted provided that the following conditions are met:	6	modification, are permitted provided that the following conditions are met:
8		7
9	- Redistributions of source code must retain the above copyright notice,	8	* Redistributions of source code must retain the above copyright notice,
10	this list of conditions and the following disclaimer.	9	this list of conditions and the following disclaimer.
11	- Redistributions in binary form must reproduce the above copyright	10
12	notice, this list of conditions and the following disclaimer in the	11	* Redistributions in binary form must reproduce the above copyright notice,
13	documentation and/or other materials provided with the distribution.	12	this list of conditions and the following disclaimer in the documentation
14	- Neither the name of Motorola Mobility nor the names of its contributors	13	and/or other materials provided with the distribution.
15	may be used to endorse or promote products derived from this software	14
16	without specific prior written permission.	15	* Neither the name of Motorola Mobility LLC nor the names of its
		16	contributors may be used to endorse or promote products derived from this
		17	software without specific prior written permission.
17		18
18	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"	19	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE	20	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE	21	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE	22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR	23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF	24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS	25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -27,13 +28,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	28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28	POSSIBILITY OF SUCH DAMAGE.	29	POSSIBILITY OF SUCH DAMAGE.
29	</copyright> */	30	</copyright> */
30		31
31	/*	32	/*
32	Panel Container - A container for other panels	33	Panel Container - A container for other panels
33	*/	34	*/
34	var Montage = require("montage/core/core").Montage,	35	var Montage = require("montage/core/core").Montage,
35	Component = require("montage/ui/component").Component;	36	Component = require("montage/ui/component").Component;
36		37
37	exports.PanelContainer = Montage.create(Component, {	38	exports.PanelContainer = Montage.create(Component, {
38		39
39	panelSplitter: {	40	panelSplitter: {
@@ -167,19 +168,19 @@ exports.PanelContainer = Montage.create(Component, {
167	this.application.localStorage.setItem("panels", this.currentPanelState);	168	this.application.localStorage.setItem("panels", this.currentPanelState);
168	}	169	}
169	},	170	},
170		171
171	prepareForDraw: {	172	prepareForDraw: {
172	value: function() {	173	value: function() {
173	window.addEventListener("resize", this, false);	174	window.addEventListener("resize", this, false);
174	}	175	}
175	},	176	},
176		177
177	handlePanelResizing: {	178	handlePanelResizing: {
178	value: function(e) {	179	value: function(e) {
179	this._setPanelsSizes(e.target);	180	this._setPanelsSizes(e.target);
180	}	181	}
181	},	182	},
182		183
183	handleResize: {	184	handleResize: {
184	value: function(e) {	185	value: function(e) {
185	this._redrawPanels(null, true);	186	this._redrawPanels(null, true);
@@ -220,7 +221,7 @@ exports.PanelContainer = Montage.create(Component, {
220		221
221	}	222	}
222	},	223	},
223		224
224	_setPanelsSizes: {	225	_setPanelsSizes: {
225	value: function(panelActivated) {	226	value: function(panelActivated) {
226	var availablePanels = this.panelsAvailable();	227	var availablePanels = this.panelsAvailable();
@@ -283,7 +284,7 @@ exports.PanelContainer = Montage.create(Component, {
283	}	284	}
284	}	285	}
285	},	286	},
286		287
287	handleAction: {	288	handleAction: {
288	value: function(e) {	289	value: function(e) {
289	var unlockPanels = true;	290	var unlockPanels = true;
@@ -315,5 +316,5 @@ exports.PanelContainer = Montage.create(Component, {
315	}	316	}
316	}	317	}
317	}	318	}
318		319
319	});	320	});