ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing more display issues.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-11-03 22:34:34 +00:00
parent c05b313450
commit abf09cfb40
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameAnimations.js
View File

@@ -12,7 +12,7 @@ var GameAnimations = Class.extend({
getAnimationLength: function(origValue) { getAnimationLength: function(origValue) {
if (this.game.replayMode) if (this.game.replayMode)
return origValue * 2; return origValue * 1;
return origValue; return origValue;
}, },
@@ -137,6 +137,12 @@ var GameAnimations = Class.extend({
var targetCardWidth = $(targetCard).width(); var targetCardWidth = $(targetCard).width();
var targetCardHeight = $(targetCard).height(); var targetCardHeight = $(targetCard).height();
if (card.horizontal != $(targetCard).data("card").horizontal) {
var tempSize = targetCardHeight;
targetCardHeight = targetCardWidth;
targetCardWidth = tempSize;
}
$(cardDiv).css( $(cardDiv).css(
{ {
position: "absolute", position: "absolute",
@@ -159,9 +165,9 @@ var GameAnimations = Class.extend({
queue: false, queue: false,
complete: null}); complete: null});
} }
setTimeout(next, that.getAnimationLength(that.cardAffectsCardDuration));
} }
setTimeout(next, that.getAnimationLength(that.cardAffectsCardDuration));
}).queue( }).queue(
function(next) { function(next) {
$(".card").each( $(".card").each(

2
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
View File

@@ -205,7 +205,6 @@ var GempLotrGameUI = Class.extend({
this.gameStateElem = $("<div class='ui-widget-content'></div>"); this.gameStateElem = $("<div class='ui-widget-content'></div>");
this.gameStateElem.css({"border-radius": "7px"}); this.gameStateElem.css({"border-radius": "7px"});
this.gameStateElem.append("<b>Players:</b><br>");
for (var i = 0; i < this.allPlayerIds.length; i++) { for (var i = 0; i < this.allPlayerIds.length; i++) {
this.gameStateElem.append("<div class='player'>" + this.allPlayerIds[i] + "<div id='clock" + i + "' class='clock'></div>" this.gameStateElem.append("<div class='player'>" + this.allPlayerIds[i] + "<div id='clock" + i + "' class='clock'></div>"
+ "<div class='playerStats'><div id='deck" + i + "' style='display: inline;'></div> <div id='hand" + i + "' style='display: inline;'></div> <div id='discard" + i + "' style='display: inline;'></div> <div id='deadPile" + i + "' style='display: inline;'></div></div></div>"); + "<div class='playerStats'><div id='deck" + i + "' style='display: inline;'></div> <div id='hand" + i + "' style='display: inline;'></div> <div id='discard" + i + "' style='display: inline;'></div> <div id='deadPile" + i + "' style='display: inline;'></div></div></div>");
@@ -214,7 +213,6 @@ var GempLotrGameUI = Class.extend({
this.gameStateElem.append("<br>"); this.gameStateElem.append("<br>");
this.gameStateElem.append("<div class='twilightPool'>0</div>"); this.gameStateElem.append("<div class='twilightPool'>0</div>");
this.gameStateElem.append("<b>Phases:</b><br>");
this.gameStateElem.append("<div class='phase' id='FELLOWSHIP'>Fellowship</div>"); this.gameStateElem.append("<div class='phase' id='FELLOWSHIP'>Fellowship</div>");
this.gameStateElem.append("<div class='phase' id='SHADOW'>Shadow</div>"); this.gameStateElem.append("<div class='phase' id='SHADOW'>Shadow</div>");
this.gameStateElem.append("<div class='phase' id='MANEUVER'>Maneuver</div>"); this.gameStateElem.append("<div class='phase' id='MANEUVER'>Maneuver</div>");