Merge branch 'refs/heads/TimelineUberJD' into Timeline-local-kruti

author: Kruti Shah 2012-07-09 11:30:37 -0700
committer: Kruti Shah 2012-07-09 11:30:37 -0700
commit: 35a31845720beb1296dc42a79fa068601dfc52cb (patch)
tree: 252ba58a3f2bb9600262c48571cc3dabaee36449 /js/components/popup-manager.reel
parent: b35edd96135bd8c2b500ffee08474bacd17c25ac (diff)
parent: 39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
download: ninja-35a31845720beb1296dc42a79fa068601dfc52cb.tar.gz
2 files changed, 56 insertions, 8 deletions
diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html
index 399a2115..281477f1 100755
--- a/js/components/popup-manager.reel/popup-manager.html
+++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,9 +1,33 @@
 <!DOCTYPE html>
 <!-- 
 <copyright>
-        This file contains proprietary software owned by Motorola Mobility, Inc.
+Copyright (c) 2012, Motorola Mobility, Inc
-        No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
+All Rights Reserved.
-        (c) Copyright 2011 Motorola Mobility, Inc. 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,
+    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
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility 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
+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
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+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>
 -->
 <html lang="en">
@@ -30,4 +54,4 @@
    
        </body>
-</html>
-\ No newline at end of file
+</html>
diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js
index cf818b4e..07a07806 100755
--- a/js/components/popup-manager.reel/popup-manager.js
+++ b/js/components/popup-manager.reel/popup-manager.js
@@ -1,7 +1,31 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+Copyright (c) 2012, Motorola Mobility, Inc
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+All Rights Reserved.
-(c) Copyright 2011 Motorola Mobility, Inc.  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,
+    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
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility 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
+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
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+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> */
 ////////////////////////////////////////////////////////////////////////
@@ -152,4 +176,4 @@ exports.PopupManager = Montage.create(Component, {
        }
    }
    ////////////////////////////////////////////////////////////////////
-});
-\ No newline at end of file
+});
author	Kruti Shah	2012-07-09 11:30:37 -0700
committer	Kruti Shah	2012-07-09 11:30:37 -0700
commit	35a31845720beb1296dc42a79fa068601dfc52cb (patch)
tree	252ba58a3f2bb9600262c48571cc3dabaee36449 /js/components/popup-manager.reel
parent	b35edd96135bd8c2b500ffee08474bacd17c25ac (diff)
parent	39aa69624e1e3b8598b0242ee6ec436862b67280 (diff)
download	ninja-35a31845720beb1296dc42a79fa068601dfc52cb.tar.gz

diff --git a/js/components/popup-manager.reel/popup-manager.html b/js/components/popup-manager.reel/popup-manager.html index 399a2115..281477f1 100755 --- a/js/components/popup-manager.reel/popup-manager.html +++ b/js/components/popup-manager.reel/popup-manager.html
@@ -1,9 +1,33 @@
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2	<!--	2	<!--
3	<copyright>	3	<copyright>
4	This file contains proprietary software owned by Motorola Mobility, Inc.	4	Copyright (c) 2012, Motorola Mobility, Inc
5	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.	5	All Rights Reserved.
6	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	6	BSD License.
		7
		8	Redistribution and use in source and binary forms, with or without
		9	modification, are permitted provided that the following conditions are met:
		10
		11	- Redistributions of source code must retain the above copyright notice,
		12	this list of conditions and the following disclaimer.
		13	- Redistributions in binary form must reproduce the above copyright
		14	notice, this list of conditions and the following disclaimer in the
		15	documentation and/or other materials provided with the distribution.
		16	- Neither the name of Motorola Mobility nor the names of its contributors
		17	may be used to endorse or promote products derived from this software
		18	without specific prior written permission.
		19
		20	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
		21	AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
		22	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		23	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		24	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		25	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		26	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		27	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		28	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		29	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		30	POSSIBILITY OF SUCH DAMAGE.
7	</copyright>	31	</copyright>
8	-->	32	-->
9	<html lang="en">	33	<html lang="en">
@@ -30,4 +54,4 @@
30		54
31	</body>	55	</body>
32		56
33	</html> \ No newline at end of file	57	</html>


diff --git a/js/components/popup-manager.reel/popup-manager.js b/js/components/popup-manager.reel/popup-manager.js index cf818b4e..07a07806 100755 --- a/js/components/popup-manager.reel/popup-manager.js +++ b/js/components/popup-manager.reel/popup-manager.js
@@ -1,7 +1,31 @@
1	/* <copyright>	1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>	2	Copyright (c) 2012, Motorola Mobility, Inc
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>	3	All Rights Reserved.
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.	4	BSD License.
		5
		6	Redistribution and use in source and binary forms, with or without
		7	modification, are permitted provided that the following conditions are met:
		8
		9	- Redistributions of source code must retain the above copyright notice,
		10	this list of conditions and the following disclaimer.
		11	- Redistributions in binary form must reproduce the above copyright
		12	notice, this list of conditions and the following disclaimer in the
		13	documentation and/or other materials provided with the distribution.
		14	- Neither the name of Motorola Mobility nor the names of its contributors
		15	may be used to endorse or promote products derived from this software
		16	without specific prior written permission.
		17
		18	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	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		21	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
		22	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		23	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		24	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		25	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		26	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	POSSIBILITY OF SUCH DAMAGE.
5	</copyright> */	29	</copyright> */
6		30
7	////////////////////////////////////////////////////////////////////////	31	////////////////////////////////////////////////////////////////////////
@@ -152,4 +176,4 @@ exports.PopupManager = Montage.create(Component, {
152	}	176	}
153	}	177	}
154	////////////////////////////////////////////////////////////////////	178	////////////////////////////////////////////////////////////////////
155	}); \ No newline at end of file	179	});