diff options
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 45353a08..3d31a50b 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1217,8 +1217,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1217 | arrCurrentElementsSelected = []; | 1217 | arrCurrentElementsSelected = []; |
1218 | var matchedValues = 0; | 1218 | var matchedValues = 0; |
1219 | 1219 | ||
1220 | for(i=0;i<arrSelectedIndexesLength;i++){ | 1220 | /* |
1221 | for(j=0;j<currentLayersSelectedLength;j++){ | 1221 | if (arrSelectedIndexesLength !== 0) { |
1222 | for(i=0;i<arrSelectedIndexesLength;i++){ | ||
1223 | for(j=0;j<currentLayersSelectedLength;j++){ | ||
1224 | |||
1225 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ | ||
1226 | matchedValues+=1; | ||
1227 | } | ||
1228 | } | ||
1229 | } | ||
1230 | |||
1231 | if(matchedValues === arrSelectedIndexesLength){ | ||
1232 | return; | ||
1233 | } | ||
1234 | } | ||
1222 | 1235 | ||
1223 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){ | 1236 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayersSelected[j]]){ |
1224 | matchedValues+=1; | 1237 | matchedValues+=1; |
@@ -1226,11 +1239,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1226 | } | 1239 | } |
1227 | } | 1240 | } |
1228 | 1241 | ||
1229 | if(matchedValues === arrSelectedIndexesLength){ | ||
1230 | return; | ||
1231 | } | ||
1232 | 1242 | ||
1233 | /* | ||
1234 | // TODO: this should probably check to see if it actually needs to run. | 1243 | // TODO: this should probably check to see if it actually needs to run. |
1235 | 1244 | ||
1236 | console.log(arrSelectedIndexes); | 1245 | console.log(arrSelectedIndexes); |
@@ -1266,6 +1275,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1266 | if (arrSelectedIndexes.indexOf(i) < 0) { | 1275 | if (arrSelectedIndexes.indexOf(i) < 0) { |
1267 | this.arrLayers[i].layerData.isSelected = false; | 1276 | this.arrLayers[i].layerData.isSelected = false; |
1268 | this.triggerLayerBinding(i); | 1277 | this.triggerLayerBinding(i); |
1278 | |||
1279 | // Check to see if this layer, that we're deselecting, has | ||
1280 | // any selected keyframes associated with it. If it does, deselect them. | ||
1281 | for (var j = 0; j < this.selectedTweens.length; j++) { | ||
1282 | var currentStageElement; | ||
1283 | if (typeof(this.selectedTweens[j].parentComponent.parentComponent.trackType) === "undefined") { | ||
1284 | currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.stageElement; | ||
1285 | } else { | ||
1286 | currentStageElement = this.selectedTweens[j].parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.parentComponent.stageElement; | ||
1287 | } | ||
1288 | if (this.arrLayers[i].layerData.stageElement === currentStageElement) { | ||
1289 | this.selectedTweens[j].deselectTween(); | ||
1290 | this.selectedTweens.splice(j, 1); | ||
1291 | } | ||
1292 | } | ||
1269 | } | 1293 | } |
1270 | } | 1294 | } |
1271 | } | 1295 | } |
@@ -1273,8 +1297,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1273 | this.currentLayersSelected = false; | 1297 | this.currentLayersSelected = false; |
1274 | } | 1298 | } |
1275 | 1299 | ||
1276 | // Deselect any tweens | 1300 | // Deselect tweens |
1277 | this.deselectTweens(); | 1301 | //this.deselectTweens(); |
1278 | 1302 | ||
1279 | 1303 | ||
1280 | // If we are actually going to be selecting things, create an empty array to use | 1304 | // If we are actually going to be selecting things, create an empty array to use |