diff options
Diffstat (limited to 'js/panels')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 19 | ||||
-rw-r--r-- | js/panels/Timeline/Tween.reel/Tween.js | 3 |
2 files changed, 20 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 12b481de..50171260 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -1215,8 +1215,24 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1215 | boolContinue = false, | 1215 | boolContinue = false, |
1216 | arrSelectedLayers = false, | 1216 | arrSelectedLayers = false, |
1217 | arrCurrentElementsSelected = []; | 1217 | arrCurrentElementsSelected = []; |
1218 | var matchedValues = 0; | ||
1219 | |||
1220 | for(i=0;i<arrSelectedIndexesLength;i++){ | ||
1221 | for(j=0;j<currentLayersSelectedLength;j++){ | ||
1222 | |||
1223 | if(this.arrLayers[arrSelectedIndexes[i]] === this.arrLayers[this.currentLayerSelected[j]]){ | ||
1224 | matchedValues+=1; | ||
1225 | } | ||
1226 | } | ||
1227 | } | ||
1228 | |||
1229 | if(matchedValues === arrSelectedIndexesLength){ | ||
1230 | return; | ||
1231 | } | ||
1232 | |||
1218 | /* | 1233 | /* |
1219 | // TODO: this should probably check to see if it actually needs to run. | 1234 | // TODO: this should probably check to see if it actually needs to run. |
1235 | |||
1220 | console.log(arrSelectedIndexes); | 1236 | console.log(arrSelectedIndexes); |
1221 | console.log(this.currentLayersSelected); | 1237 | console.log(this.currentLayersSelected); |
1222 | // Compare arrSelectedIndexes with this.currentLayersSelected | 1238 | // Compare arrSelectedIndexes with this.currentLayersSelected |
@@ -1258,7 +1274,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
1258 | } | 1274 | } |
1259 | 1275 | ||
1260 | // Deselect any tweens | 1276 | // Deselect any tweens |
1261 | this.deselectTweens(); | 1277 | this.deselectTweens(); |
1278 | |||
1262 | 1279 | ||
1263 | // If we are actually going to be selecting things, create an empty array to use | 1280 | // If we are actually going to be selecting things, create an empty array to use |
1264 | if (arrSelectedIndexesLength > 0) { | 1281 | if (arrSelectedIndexesLength > 0) { |
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js index b8fe8b8d..369b270a 100644 --- a/js/panels/Timeline/Tween.reel/Tween.js +++ b/js/panels/Timeline/Tween.reel/Tween.js | |||
@@ -221,7 +221,8 @@ var Tween = exports.Tween = Montage.create(Component, { | |||
221 | 221 | ||
222 | setTweenProperties:{ | 222 | setTweenProperties:{ |
223 | value:function (eventDetail) { | 223 | value:function (eventDetail) { |
224 | if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline") { | 224 | |
225 | if (eventDetail.source === "SelectionTool" || eventDetail.source === "timeline" || eventDetail.source === "pi") { | ||
225 | if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ | 226 | if(this.parentComponent.parentComponent.animatedElement.offsetTop != this.tweenedProperties["top"]){ |
226 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; | 227 | this.tweenedProperties["top"] = this.parentComponent.parentComponent.animatedElement.offsetTop + "px"; |
227 | } | 228 | } |