Merge pull request #376 from kriskowal/bsd

BSD License
author: Valerio Virgillito 2012-07-09 16:36:43 -0700
committer: Valerio Virgillito 2012-07-09 16:36:43 -0700
commit: a5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18 (patch)
tree: 59a70d2050e3b6cff5dad08be1195301a715ecf7 /js/panels/binding-panel.reel
parent: 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
parent: fdbec324dad4ab33d97282ab021d2c1661bc097c (diff)
download: ninja-a5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18.tar.gz
3 files changed, 56 insertions, 24 deletions
diff --git a/js/panels/binding-panel.reel/binding-panel.css b/js/panels/binding-panel.reel/binding-panel.css
index 3e0017c7..9fa9c025 100644
--- a/js/panels/binding-panel.reel/binding-panel.css
+++ b/js/panels/binding-panel.reel/binding-panel.css
@@ -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
diff --git a/js/panels/binding-panel.reel/binding-panel.html b/js/panels/binding-panel.reel/binding-panel.html
index 3deee8c3..c922ae38 100644
--- a/js/panels/binding-panel.reel/binding-panel.html
+++ b/js/panels/binding-panel.reel/binding-panel.html
@@ -1,25 +1,26 @@
 <!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
diff --git a/js/panels/binding-panel.reel/binding-panel.js b/js/panels/binding-panel.reel/binding-panel.js
index c040c009..77565a5c 100644
--- a/js/panels/binding-panel.reel/binding-panel.js
+++ b/js/panels/binding-panel.reel/binding-panel.js
@@ -1,3 +1,33 @@
+/* <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+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 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 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
+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> */
 var Montage         = require("montage/core/core").Montage,
    Component       = require("montage/ui/component").Component;
@@ -120,7 +150,7 @@ exports.BindingPanel = Montage.create(Component, {
                    editViewEl.style.removeProperty(transStr);
                }
            }
-            
        }
    }
-});
-\ No newline at end of file
+});
author	Valerio Virgillito	2012-07-09 16:36:43 -0700
committer	Valerio Virgillito	2012-07-09 16:36:43 -0700
commit	a5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18 (patch)
tree	59a70d2050e3b6cff5dad08be1195301a715ecf7 /js/panels/binding-panel.reel
parent	84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff)
parent	fdbec324dad4ab33d97282ab021d2c1661bc097c (diff)
download	ninja-a5296ddf26a5d8ab7e99643dd1324b6a1f9b4f18.tar.gz

diff --git a/js/panels/binding-panel.reel/binding-panel.css b/js/panels/binding-panel.reel/binding-panel.css index 3e0017c7..9fa9c025 100644 --- a/js/panels/binding-panel.reel/binding-panel.css +++ b/js/panels/binding-panel.reel/binding-panel.css
@@ -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


diff --git a/js/panels/binding-panel.reel/binding-panel.html b/js/panels/binding-panel.reel/binding-panel.html index 3deee8c3..c922ae38 100644 --- a/js/panels/binding-panel.reel/binding-panel.html +++ b/js/panels/binding-panel.reel/binding-panel.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


diff --git a/js/panels/binding-panel.reel/binding-panel.js b/js/panels/binding-panel.reel/binding-panel.js index c040c009..77565a5c 100644 --- a/js/panels/binding-panel.reel/binding-panel.js +++ b/js/panels/binding-panel.reel/binding-panel.js
@@ -1,3 +1,33 @@
		1	/* <copyright>
		2	Copyright (c) 2012, Motorola Mobility LLC.
		3	All Rights Reserved.
		4
		5	Redistribution and use in source and binary forms, with or without
		6	modification, are permitted provided that the following conditions are met:
		7
		8	* Redistributions of source code must retain the above copyright notice,
		9	this list of conditions and the following disclaimer.
		10
		11	* Redistributions in binary form must reproduce the above copyright notice,
		12	this list of conditions and the following disclaimer in the documentation
		13	and/or other materials provided with the distribution.
		14
		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.
		18
		19	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	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
		22	ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
		23	LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
		24	CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
		25	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
		26	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
		27	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
		28	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
		29	POSSIBILITY OF SUCH DAMAGE.
		30	</copyright> */
1	var Montage = require("montage/core/core").Montage,	31	var Montage = require("montage/core/core").Montage,
2	Component = require("montage/ui/component").Component;	32	Component = require("montage/ui/component").Component;
3		33
@@ -120,7 +150,7 @@ exports.BindingPanel = Montage.create(Component, {
120	editViewEl.style.removeProperty(transStr);	150	editViewEl.style.removeProperty(transStr);
121	}	151	}
122	}	152	}
123		153
124	}	154	}
125	}	155	}
126	}); \ No newline at end of file	156	});