| changeset 1784: |
1d599e16185b |
| parent 1783: | 995bd65e4da2 |
| child 1785: | 31d1a82738ec |
|---|
| child 1813: | fb4a1197c75a |
|---|
| child 1866: | fd5e29904069 |
| author: |
"Johan Euphrosine <proppy@aminche.com>" |
| date: |
Fri Jan 22 20:02:12 2010 +0100 (7 months ago) |
| files: |
jpoker/js/jquery.jpoker.js jpoker/js/test-jpoker.js |
| description: |
rebuy should be shown if money < buyIn.max instead of money < min(buyIn.max, bankroll) |
--- a/jpoker/js/jquery.jpoker.js Fri Jan 22 13:05:40 2010 +0100
+++ b/jpoker/js/jquery.jpoker.js Fri Jan 22 20:02:12 2010 +0100
@@ -4771,8 +4771,8 @@
chips: function(player, id) {
var table = jpoker.getTable(player.url, player.game_id);
if(table.state == 'end') {
- var limits = table.buyInLimits();
- if(player.money < limits[2]) {
+ var limits = table.buyIn;
+ if(player.money < limits.max) {
$('#rebuy' + id).show();
} else {
$('#rebuy' + id).hide();
--- a/jpoker/js/test-jpoker.js Fri Jan 22 13:05:40 2010 +0100
+++ b/jpoker/js/test-jpoker.js Fri Jan 22 20:02:12 2010 +0100
@@ -9204,7 +9204,7 @@
});
test("jpoker.plugins.player: no rebuy if money", function() {
- expect(1);
+ expect(3);
var id = 'jpoker' + jpoker.serial;
var server = jpoker.serverCreate({ url: 'url' });
@@ -9216,7 +9216,8 @@
var table_packet = { id: game_id, currency_serial: currency_serial };
server.tables[game_id] = new jpoker.table(server, table_packet);
- server.tables[game_id].buyIn.min = 1000;
+ server.tables[game_id].buyIn.min = 500;
+ server.tables[game_id].buyIn.max = 1000;
server.tables[game_id].buyIn.bankroll = 1000;
server.tables[game_id].is_tourney = false;
@@ -9230,7 +9231,20 @@
ok(false, 'rebuy should not be clicked');
});
server.tables[game_id].handler(server, game_id, { type: 'PacketPokerPlayerChips',
- money: 100,
+ money: 10000,
+ bet: 0,
+ serial: player_serial,
+ game_id: game_id });
+ equals(rebuy.is(':visible'), true, 'rebuy visible');
+ server.tables[game_id].handler(server, game_id, { type: 'PacketPokerPlayerChips',
+ money: 100000,
+ bet: 0,
+ serial: player_serial,
+ game_id: game_id });
+ equals(rebuy.is(':visible'), false, 'rebuy hidden');
+ server.tables[game_id].buyIn.bankroll = 100;
+ server.tables[game_id].handler(server, game_id, { type: 'PacketPokerPlayerChips',
+ money: 10000,
bet: 0,
serial: player_serial,
game_id: game_id });