BSD License

author: Kris Kowal 2012-07-09 16:38:08 -0700
committer: Kris Kowal 2012-07-09 16:38:08 -0700
commit: 7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch)
tree: 5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/panels/Timeline/EasingMenu.reel
parent: 26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff)
download: ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz
4 files changed, 64 insertions, 60 deletions
diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
index dcf35d8f..a32a1f6b 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.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/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
index 6d41afb0..32f21d2b 100644
--- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js
+++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.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
@@ -39,7 +40,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
    },
        /* Begin: Models */
-        
        // popup: the initialized component.
    _popup: {
                value: null
@@ -52,7 +53,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                this._popup = newVal
        }
    },
-    
    // callingComponent: pointer to the span that called for the menu
    _callingComponent: {
        value: null
@@ -65,7 +66,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                this._callingComponent = newVal;
        }
    },
-    
    // anchor: pointer to the anchoring element
    _anchor: {
        value: null
@@ -78,8 +79,8 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                this._anchor = newVal;
        }
    },
-    
-    
    _top: {
        value: null
    },
@@ -102,7 +103,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                this._left = newVal;
        }
    },
-    
    // currentChoice: The data attribute of the current choice
    _currentChoice: {
        value: "none"
@@ -115,13 +116,13 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                this._currentChoice = newVal;
        }
    },
-    
    _isShown: {
        value: false
    },
-    
    /* End: Models */
-    
    /* Begin: Draw Cycle */
    willDraw: {
        value: function() {
@@ -129,7 +130,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                document.addEventListener("scroll", this.handleDocumentScroll.bind(this), false);
        }
    },
-    
    draw: {
        value: function() {
                // Update the selection classes.
@@ -148,7 +149,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
        }
    },
        /* End Draw Cycle */
-    
    /* Begin: Controllers */
        show: {
                value: function() {
@@ -158,7 +159,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                    this.popup.modal = false;
                    this.popup.content = EasingMenu.create();
            }
-            
            // Show the popup
            this.popup.anchor = this.anchor;
            var position = {};
@@ -182,10 +183,10 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
                                easingSelected.classList.remove("easing-selected");
                        }
                event.target.classList.add("easing-selected");
-                
                // Set the easing in the span that called us
                this.callingComponent.easing = event.target.dataset.ninjaEase;
author	Kris Kowal	2012-07-09 16:38:08 -0700
committer	Kris Kowal	2012-07-09 16:38:08 -0700
commit	7bee50379c1df86bb571e0e8d6c08e24d25231f5 (patch)
tree	5b11abd0414e0a3ab50ec6276b6334fbd168db7e /js/panels/Timeline/EasingMenu.reel
parent	26d4b5ce30e6e0ea6e0fde870853c1e2a673a7b4 (diff)
download	ninja-7bee50379c1df86bb571e0e8d6c08e24d25231f5.tar.gz

diff --git a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html b/js/panels/Timeline/EasingMenu.reel/EasingMenu.html index dcf35d8f..a32a1f6b 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.html +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.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/Timeline/EasingMenu.reel/EasingMenu.js b/js/panels/Timeline/EasingMenu.reel/EasingMenu.js index 6d41afb0..32f21d2b 100644 --- a/js/panels/Timeline/EasingMenu.reel/EasingMenu.js +++ b/js/panels/Timeline/EasingMenu.reel/EasingMenu.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
@@ -39,7 +40,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
39	},	40	},
40		41
41	/* Begin: Models */	42	/* Begin: Models */
42		43
43	// popup: the initialized component.	44	// popup: the initialized component.
44	_popup: {	45	_popup: {
45	value: null	46	value: null
@@ -52,7 +53,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
52	this._popup = newVal	53	this._popup = newVal
53	}	54	}
54	},	55	},
55		56
56	// callingComponent: pointer to the span that called for the menu	57	// callingComponent: pointer to the span that called for the menu
57	_callingComponent: {	58	_callingComponent: {
58	value: null	59	value: null
@@ -65,7 +66,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
65	this._callingComponent = newVal;	66	this._callingComponent = newVal;
66	}	67	}
67	},	68	},
68		69
69	// anchor: pointer to the anchoring element	70	// anchor: pointer to the anchoring element
70	_anchor: {	71	_anchor: {
71	value: null	72	value: null
@@ -78,8 +79,8 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
78	this._anchor = newVal;	79	this._anchor = newVal;
79	}	80	}
80	},	81	},
81		82
82		83
83	_top: {	84	_top: {
84	value: null	85	value: null
85	},	86	},
@@ -102,7 +103,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
102	this._left = newVal;	103	this._left = newVal;
103	}	104	}
104	},	105	},
105		106
106	// currentChoice: The data attribute of the current choice	107	// currentChoice: The data attribute of the current choice
107	_currentChoice: {	108	_currentChoice: {
108	value: "none"	109	value: "none"
@@ -115,13 +116,13 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
115	this._currentChoice = newVal;	116	this._currentChoice = newVal;
116	}	117	}
117	},	118	},
118		119
119	_isShown: {	120	_isShown: {
120	value: false	121	value: false
121	},	122	},
122		123
123	/* End: Models */	124	/* End: Models */
124		125
125	/* Begin: Draw Cycle */	126	/* Begin: Draw Cycle */
126	willDraw: {	127	willDraw: {
127	value: function() {	128	value: function() {
@@ -129,7 +130,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
129	document.addEventListener("scroll", this.handleDocumentScroll.bind(this), false);	130	document.addEventListener("scroll", this.handleDocumentScroll.bind(this), false);
130	}	131	}
131	},	132	},
132		133
133	draw: {	134	draw: {
134	value: function() {	135	value: function() {
135	// Update the selection classes.	136	// Update the selection classes.
@@ -148,7 +149,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
148	}	149	}
149	},	150	},
150	/* End Draw Cycle */	151	/* End Draw Cycle */
151		152
152	/* Begin: Controllers */	153	/* Begin: Controllers */
153	show: {	154	show: {
154	value: function() {	155	value: function() {
@@ -158,7 +159,7 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
158	this.popup.modal = false;	159	this.popup.modal = false;
159	this.popup.content = EasingMenu.create();	160	this.popup.content = EasingMenu.create();
160	}	161	}
161		162
162	// Show the popup	163	// Show the popup
163	this.popup.anchor = this.anchor;	164	this.popup.anchor = this.anchor;
164	var position = {};	165	var position = {};
@@ -182,10 +183,10 @@ var EasingMenu = exports.EasingMenu = Montage.create(Component, {
182	easingSelected.classList.remove("easing-selected");	183	easingSelected.classList.remove("easing-selected");
183	}	184	}
184	event.target.classList.add("easing-selected");	185	event.target.classList.add("easing-selected");
185		186
186	// Set the easing in the span that called us	187	// Set the easing in the span that called us
187	this.callingComponent.easing = event.target.dataset.ninjaEase;	188	this.callingComponent.easing = event.target.dataset.ninjaEase;