3 files changed, 78 insertions, 75 deletions
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index 9f8baf86..72abe2b8 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.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
@@ -29,9 +30,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 </copyright> -->
 <html lang="en">
-        <head>
+    <head>
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="css/Keyframe.css">
+        <link rel="stylesheet" type="text/css" href="css/Keyframe.css">
        <script type="text/montage-serialization">
                    {
                        "owner": {
@@ -43,11 +44,11 @@ POSSIBILITY OF SUCH DAMAGE.
                    }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-        <div data-montage-id="keyframespace" class="tween_keyframe">
+        <div data-montage-id="keyframespace" class="tween_keyframe">
-        </div>
+        </div>
    </body>
 </html>
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js
index 9ded9c76..e261f926 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.js
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.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
@@ -70,12 +71,12 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
    prepareForDraw:{
        value:function(){
            this.element.addEventListener("click", this, false);
-            
-                        // Drag and drop event handlers
+            // Drag and drop event handlers
-                        this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
+            this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
-                        this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
+            this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
-                        this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
+            this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
-                        this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
+            this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
        }
    },
@@ -124,39 +125,39 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
            ev.stopPropagation();
        }
    },
-    
-        handleMouseover: {
+    handleMouseover: {
-                value: function(event) {
+        value: function(event) {
-                        this.element.draggable = true;
+            this.element.draggable = true;
-                }
+        }
-        },
+    },
-        handleMouseout: {
+    handleMouseout: {
-                value: function(event) {
+        value: function(event) {
-                        this.element.draggable = false;
+            this.element.draggable = false;
-                }
+        }
-        },
+    },
-        handleDragstart: {
+    handleDragstart: {
-                value: function(event) {
+        value: function(event) {
-                        //this.parentComponent.parentComponent.dragLayerID = this.layerID;
+            //this.parentComponent.parentComponent.dragLayerID = this.layerID;
            event.dataTransfer.setData('Text', 'Keyframe');
-            
            // Get my index in my track's tween array
            var i = 0,
-                tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
+                tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
-                myIndex = null;
+                myIndex = null;
            for (i = 0; i < tweenRepetitionLength; i++) {
-                if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
+                if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
-                        myIndex = i;
+                    myIndex = i;
-                }
+                }
            }
            this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
            this.selectKeyframe();
-                }
+        }
-        },
+    },
-        handleDragend: {
+    handleDragend: {
-                value: function(event) {
+        value: function(event) {
-                        this.parentComponent.isDragging = false;
+            this.parentComponent.isDragging = false;
-                }
+        }
-        }
+    }
-    
 });
diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
index 19602e0a..269373b0 100644
--- a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css
+++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.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:
 </

diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html index 9f8baf86..72abe2b8 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.html +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.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
@@ -29,9 +30,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29	POSSIBILITY OF SUCH DAMAGE.	30	POSSIBILITY OF SUCH DAMAGE.
30	</copyright> -->	31	</copyright> -->
31	<html lang="en">	32	<html lang="en">
32	<head>	33	<head>
33	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	34	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
34	<link rel="stylesheet" type="text/css" href="css/Keyframe.css">	35	<link rel="stylesheet" type="text/css" href="css/Keyframe.css">
35	<script type="text/montage-serialization">	36	<script type="text/montage-serialization">
36	{	37	{
37	"owner": {	38	"owner": {
@@ -43,11 +44,11 @@ POSSIBILITY OF SUCH DAMAGE.
43		44
44	}	45	}
45	</script>	46	</script>
46	</head>	47	</head>
47	<body>	48	<body>
48		49
49	<div data-montage-id="keyframespace" class="tween_keyframe">	50	<div data-montage-id="keyframespace" class="tween_keyframe">
50	</div>	51	</div>
51		52
52	</body>	53	</body>
53	</html>	54	</html>


diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.js b/js/panels/Timeline/Keyframe.reel/Keyframe.js index 9ded9c76..e261f926 100644 --- a/js/panels/Timeline/Keyframe.reel/Keyframe.js +++ b/js/panels/Timeline/Keyframe.reel/Keyframe.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
@@ -70,12 +71,12 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
70	prepareForDraw:{	71	prepareForDraw:{
71	value:function(){	72	value:function(){
72	this.element.addEventListener("click", this, false);	73	this.element.addEventListener("click", this, false);
73		74
74	// Drag and drop event handlers	75	// Drag and drop event handlers
75	this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);	76	this.element.addEventListener("mouseover", this.handleMouseover.bind(this), false);
76	this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);	77	this.element.addEventListener("mouseout", this.handleMouseout.bind(this), false);
77	this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);	78	this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
78	this.element.addEventListener("dragend", this.handleDragend.bind(this), false);	79	this.element.addEventListener("dragend", this.handleDragend.bind(this), false);
79	}	80	}
80	},	81	},
81		82
@@ -124,39 +125,39 @@ var Keyframe = exports.Keyframe = Montage.create(Component, {
124	ev.stopPropagation();	125	ev.stopPropagation();
125	}	126	}
126	},	127	},
127		128
128	handleMouseover: {	129	handleMouseover: {
129	value: function(event) {	130	value: function(event) {
130	this.element.draggable = true;	131	this.element.draggable = true;
131	}	132	}
132	},	133	},
133	handleMouseout: {	134	handleMouseout: {
134	value: function(event) {	135	value: function(event) {
135	this.element.draggable = false;	136	this.element.draggable = false;
136	}	137	}
137	},	138	},
138	handleDragstart: {	139	handleDragstart: {
139	value: function(event) {	140	value: function(event) {
140	//this.parentComponent.parentComponent.dragLayerID = this.layerID;	141	//this.parentComponent.parentComponent.dragLayerID = this.layerID;
141	event.dataTransfer.setData('Text', 'Keyframe');	142	event.dataTransfer.setData('Text', 'Keyframe');
142		143
143	// Get my index in my track's tween array	144	// Get my index in my track's tween array
144	var i = 0,	145	var i = 0,
145	tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,	146	tweenRepetitionLength = this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents.length,
146	myIndex = null;	147	myIndex = null;
147	for (i = 0; i < tweenRepetitionLength; i++) {	148	for (i = 0; i < tweenRepetitionLength; i++) {
148	if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {	149	if (this.parentComponent.parentComponent.parentComponent.tweenRepetition.childComponents[i].uuid === this.parentComponent.uuid) {
149	myIndex = i;	150	myIndex = i;
150	}	151	}
151	}	152	}
152	this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;	153	this.parentComponent.parentComponent.parentComponent.draggingIndex = myIndex;
153	this.selectKeyframe();	154	this.selectKeyframe();
154	}	155	}
155	},	156	},
156	handleDragend: {	157	handleDragend: {
157	value: function(event) {	158	value: function(event) {
158	this.parentComponent.isDragging = false;	159	this.parentComponent.isDragging = false;
159	}	160	}
160	}	161	}
161		162
162	});	163	});


diff --git a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css b/js/panels/Timeline/Keyframe.reel/css/Keyframe.css index 19602e0a..269373b0 100644 --- a/js/panels/Timeline/Keyframe.reel/css/Keyframe.css +++ b/js/panels/Timeline/Keyframe.reel/css/Keyframe.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	</