4 files changed, 84 insertions, 80 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
index 3f646e81..7bc6f5f9 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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/PropertyTrack.css">
+        <link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
        <script type="text/montage-serialization">
                    {
                        "owner": {
@@ -46,9 +47,9 @@ POSSIBILITY OF SUCH DAMAGE.
                        "propTween" : {
                            "prototype" : "js/panels/timeline/Tween.reel",
                            "properties" : {
-                                "element":{"#": "prop_track_lane"}
+                                "element":{"#": "prop_track_lane"}
                            },
-                                        "bindings" : {
+                            "bindings" : {
                                "tweenData" : {
                                   "boundObject" : {"@": "propTweenRepetition"},
                                   "boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
@@ -60,27 +61,27 @@ POSSIBILITY OF SUCH DAMAGE.
                        "propTweenRepetition": {
                            "prototype": "montage/ui/repetition.reel",
                            "properties": {
-                                "element": {"#": "prop_track_lanes"},
+                                "element": {"#": "prop_track_lanes"},
-                                   "isSelectionEnabled" : false
+                                   "isSelectionEnabled" : false
                            },
                            "bindings": {
                               "objects": {
-                                 "boundObject": {"@": "owner"},
+                                 "boundObject": {"@": "owner"},
-                                 "boundObjectPropertyPath": "propTweens",
+                                 "boundObjectPropertyPath": "propTweens",
-                                 "oneway": false
+                                 "oneway": false
                               }
                            }
                        }
                    }
        </script>
-        </head>
+    </head>
-        <body>
+    <body>
-                <div data-montage-id="property-track" class="timeline-track">
+        <div data-montage-id="property-track" class="timeline-track">
            <div data-montage-id="prop_track_lanes" class="prop-track">
                <div data-montage-id="prop_track_lane"></div>
            </div>
-                </div>
+        </div>
    </body>
 </html>
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 6c68fa63..a12128ff 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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
@@ -212,10 +213,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
                    // check if there is an editor property assigned yet
                    // get this property track's editor prop name from layer data arrays
                    var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
-                        currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
+                        currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
                    if (this.trackType == "style") {
-                        //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
+                        //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
                        if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {
                            console.log("Please enter a style property for this track before adding keyframes.");
                            return;
@@ -238,20 +239,20 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
            }
        }
    },
-    
    getCurrentSelectedStyleIndex: {
-        value: function(layerIndex) {
+        value: function(layerIndex) {
-                var returnVal = false,
+            var returnVal = false,
-                        i = 0,
+                i = 0,
-                        arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
+                arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
-                for (i = 0; i < arrLayerStylesLength; i++) {
+            for (i = 0; i < arrLayerStylesLength; i++) {
-                        var currItem =  this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
+                var currItem =  this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
-                        if (currItem.isSelected === true) {
+                if (currItem.isSelected === true) {
-                                returnVal = i;
+                    returnVal = i;<

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index 3f646e81..7bc6f5f9 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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/PropertyTrack.css">	35	<link rel="stylesheet" type="text/css" href="css/PropertyTrack.css">
35	<script type="text/montage-serialization">	36	<script type="text/montage-serialization">
36	{	37	{
37	"owner": {	38	"owner": {
@@ -46,9 +47,9 @@ POSSIBILITY OF SUCH DAMAGE.
46	"propTween" : {	47	"propTween" : {
47	"prototype" : "js/panels/timeline/Tween.reel",	48	"prototype" : "js/panels/timeline/Tween.reel",
48	"properties" : {	49	"properties" : {
49	"element":{"#": "prop_track_lane"}	50	"element":{"#": "prop_track_lane"}
50	},	51	},
51	"bindings" : {	52	"bindings" : {
52	"tweenData" : {	53	"tweenData" : {
53	"boundObject" : {"@": "propTweenRepetition"},	54	"boundObject" : {"@": "propTweenRepetition"},
54	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",	55	"boundObjectPropertyPath" : "objectAtCurrentIteration.tweenData",
@@ -60,27 +61,27 @@ POSSIBILITY OF SUCH DAMAGE.
60	"propTweenRepetition": {	61	"propTweenRepetition": {
61	"prototype": "montage/ui/repetition.reel",	62	"prototype": "montage/ui/repetition.reel",
62	"properties": {	63	"properties": {
63	"element": {"#": "prop_track_lanes"},	64	"element": {"#": "prop_track_lanes"},
64	"isSelectionEnabled" : false	65	"isSelectionEnabled" : false
65	},	66	},
66	"bindings": {	67	"bindings": {
67	"objects": {	68	"objects": {
68	"boundObject": {"@": "owner"},	69	"boundObject": {"@": "owner"},
69	"boundObjectPropertyPath": "propTweens",	70	"boundObjectPropertyPath": "propTweens",
70	"oneway": false	71	"oneway": false
71	}	72	}
72	}	73	}
73	}	74	}
74	}	75	}
75	</script>	76	</script>
76	</head>	77	</head>
77	<body>	78	<body>
78		79
79	<div data-montage-id="property-track" class="timeline-track">	80	<div data-montage-id="property-track" class="timeline-track">
80	<div data-montage-id="prop_track_lanes" class="prop-track">	81	<div data-montage-id="prop_track_lanes" class="prop-track">
81	<div data-montage-id="prop_track_lane"></div>	82	<div data-montage-id="prop_track_lane"></div>
82	</div>	83	</div>
83	</div>	84	</div>
84		85
85	</body>	86	</body>
86	</html>	87	</html>


diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js index 6c68fa63..a12128ff 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.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
@@ -212,10 +213,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
212	// check if there is an editor property assigned yet	213	// check if there is an editor property assigned yet
213	// get this property track's editor prop name from layer data arrays	214	// get this property track's editor prop name from layer data arrays
214	var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),	215	var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
215	currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);	216	currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
216		217
217	if (this.trackType == "style") {	218	if (this.trackType == "style") {
218	//console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)	219	//console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
219	if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {	220	if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) {
220	console.log("Please enter a style property for this track before adding keyframes.");	221	console.log("Please enter a style property for this track before adding keyframes.");
221	return;	222	return;
@@ -238,20 +239,20 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
238	}	239	}
239	}	240	}
240	},	241	},
241		242
242	getCurrentSelectedStyleIndex: {	243	getCurrentSelectedStyleIndex: {
243	value: function(layerIndex) {	244	value: function(layerIndex) {
244	var returnVal = false,	245	var returnVal = false,
245	i = 0,	246	i = 0,
246	arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;	247	arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
247	for (i = 0; i < arrLayerStylesLength; i++) {	248	for (i = 0; i < arrLayerStylesLength; i++) {
248	var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];	249	var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
249	if (currItem.isSelected === true) {	250	if (currItem.isSelected === true) {
250	returnVal = i;	251	returnVal = i;<