diff options
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js')
-rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js | 53 |
1 files changed, 27 insertions, 26 deletions
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; |
251 | } | 252 | } |
252 | } | 253 | } |
253 | return returnVal; | 254 | return returnVal; |
254 | } | 255 | } |
255 | }, | 256 | }, |
256 | 257 | ||
257 | handleNewPropTween:{ | 258 | handleNewPropTween:{ |