Fixing culture tokens and animations for cardActivated not always firing-off.

This commit is contained in:
marcins78@gmail.com
2011-11-04 14:13:51 +00:00
parent 0210ef4c6c
commit ffa18d8a39
11 changed files with 9 additions and 6 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

@@ -25,10 +25,10 @@ var GameAnimations = Class.extend({
// Play-out game event animation only if it's not the player who initiated it
if (this.game.spectatorMode || this.game.replayMode || (participantId != this.game.bottomPlayerId)) {
var cardDiv = $(".card:cardId(" + cardId + ")");
if (cardDiv != null) {
$("#main").queue(
function(next) {
$("#main").queue(
function(next) {
var cardDiv = $(".card:cardId(" + cardId + ")");
if (cardDiv != null) {
$(".borderOverlay", cardDiv)
.switchClass("borderOverlay", "highlightBorderOverlay", that.getAnimationLength(that.cardActivatedDuration / 6))
.switchClass("highlightBorderOverlay", "borderOverlay", that.getAnimationLength(that.cardActivatedDuration / 6))
@@ -37,8 +37,11 @@ var GameAnimations = Class.extend({
.switchClass("borderOverlay", "highlightBorderOverlay", that.getAnimationLength(that.cardActivatedDuration / 6))
.switchClass("highlightBorderOverlay", "borderOverlay", that.getAnimationLength(that.cardActivatedDuration / 6));
setTimeout(next, that.getAnimationLength(that.cardActivatedDuration));
});
}
}
else {
next();
}
});
}
}
},