aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:52:06 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch)
tree8f0f55557bd0c47a84e49c1977c950645d284607 /js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz
Expand tabs
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js')
-rw-r--r--js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js28
1 files changed, 14 insertions, 14 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
index 6c68fa63..85ceeb4b 100644
--- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -212,10 +212,10 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
212 // check if there is an editor property assigned yet 212 // check if there is an editor property assigned yet
213 // get this property track's editor prop name from layer data arrays 213 // get this property track's editor prop name from layer data arrays
214 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID), 214 var selectIndex = this.application.ninja.timeline.getLayerIndexByID(this.trackID),
215 currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex); 215 currentSelectedStyleIndex = this.getCurrentSelectedStyleIndex(selectIndex);
216 216
217 if (this.trackType == "style") { 217 if (this.trackType == "style") {
218 //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex) 218 //console.log("PropertyTrack.handleClick; selectIndex = ", selectIndex, "; styleIndex = ", currentSelectedStyleIndex)
219 if (this.application.ninja.timeline.arrLayers[selectIndex].layerData.arrLayerStyles[currentSelectedStyleIndex].editorProperty == null) { 219 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."); 220 console.log("Please enter a style property for this track before adding keyframes.");
221 return; 221 return;
@@ -240,18 +240,18 @@ var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
240 }, 240 },
241 241
242 getCurrentSelectedStyleIndex: { 242 getCurrentSelectedStyleIndex: {
243 value: function(layerIndex) { 243 value: function(layerIndex) {
244 var returnVal = false, 244 var returnVal = false,
245 i = 0, 245 i = 0,
246 arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length; 246 arrLayerStylesLength = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles.length;
247 for (i = 0; i < arrLayerStylesLength; i++) { 247 for (i = 0; i < arrLayerStylesLength; i++) {
248 var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i]; 248 var currItem = this.application.ninja.timeline.arrLayers[layerIndex].layerData.arrLayerStyles[i];
249 if (currItem.isSelected === true) { 249 if (currItem.isSelected === true) {
250 returnVal = i; 250 returnVal = i;
251 } 251 }
252 } 252 }
253 return returnVal; 253 return returnVal;
254 } 254 }
255 }, 255 },
256 256
257 handleNewPropTween:{ 257 handleNewPropTween:{