aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html53
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js53
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/css/PropertyTrack.css23
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/scss/PropertyTrack.scss35
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 @@
1<!DOCTYPE html> 1<!doctype html>
2<!-- <copyright> 2<!-- <copyright>
3Copyright (c) 2012, Motorola Mobility, Inc 3Copyright (c) 2012, Motorola Mobility LLC.
4All Rights Reserved. 4All Rights Reserved.
5BSD License.
6 5
7Redistribution and use in source and binary forms, with or without 6Redistribution and use in source and binary forms, with or without
8modification, are permitted provided that the following conditions are met: 7modification, 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
19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 20THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 21AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 22IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 23ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 24LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 25CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 26SUBSTITUTE 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
29POSSIBILITY OF SUCH DAMAGE. 30POSSIBILITY 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>
2Copyright (c) 2012, Motorola Mobility, Inc 2Copyright (c) 2012, Motorola Mobility LLC.
3All Rights Reserved. 3All Rights Reserved.
4BSD License.
5 4
6Redistribution and use in source and binary forms, with or without 5Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met: 6modification, 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
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 19THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
21ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 22ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
22LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
23CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
24SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25SUBSTITUTE 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;
251 }