mirrors
/
PretendYoureXyzzy
mirror of https://github.com/ajanata/PretendYoureXyzzy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add missing semicolon; pull pyx.properties properties out to build.properties

This commit is contained in:
Andy Janata 2015-02-21 18:09:22 -08:00
parent 359c5e1140
commit b8e499647e
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebContent/js/cah.ajax.handlers.js
View File

@ -196,16 +196,16 @@ cah.ajax.ErrorHandlers[cah.$.AjaxOperation.LEAVE_GAME] = function(data, req) {
cah.ajax.ErrorHandlers[cah.$.AjaxOperation.START_GAME] = function(data, req) { cah.ajax.ErrorHandlers[cah.$.AjaxOperation.START_GAME] = function(data, req) {
if (data[cah.$.AjaxResponse.ERROR_CODE] == cah.$.ErrorCode.NOT_ENOUGH_CARDS) { if (data[cah.$.AjaxResponse.ERROR_CODE] == cah.$.ErrorCode.NOT_ENOUGH_CARDS) {
var msg = "With current settings, the game requires " var msg = "With current settings, the game requires "
+ data[cah.$.ErrorInformation.BLACK_CARDS_REQUIRED] + data[cah.$.ErrorInformation.BLACK_CARDS_REQUIRED] + " black cards and "
+ " black cards and " + data[cah.$.ErrorInformation.WHITE_CARDS_REQUIRED] + data[cah.$.ErrorInformation.WHITE_CARDS_REQUIRED] + " white cards, but only has "
+ " white cards, but only has " + data[cah.$.ErrorInformation.BLACK_CARDS_PRESENT] + data[cah.$.ErrorInformation.BLACK_CARDS_PRESENT] + " black cards and "
+ " black cards and " + data[cah.$.ErrorInformation.WHITE_CARDS_PRESENT] + " white cards."; + data[cah.$.ErrorInformation.WHITE_CARDS_PRESENT] + " white cards.";
cah.log.status_with_game(req[cah.$.AjaxRequest.GAME_ID], msg, "error"); cah.log.status_with_game(req[cah.$.AjaxRequest.GAME_ID], msg, "error");
} else { } else {
cah.log.error(cah.$.ErrorCode_msg[data[cah.$.AjaxResponse.ERROR_CODE]]); cah.log.error(cah.$.ErrorCode_msg[data[cah.$.AjaxResponse.ERROR_CODE]]);
} }
} };
cah.ajax.SuccessHandlers[cah.$.AjaxOperation.START_GAME] = function(data, req) { cah.ajax.SuccessHandlers[cah.$.AjaxOperation.START_GAME] = function(data, req) {
var game = cah.currentGames[data[cah.$.AjaxRequest.GAME_ID]]; var game = cah.currentGames[data[cah.$.AjaxRequest.GAME_ID]];

5
build.properties.example
View File

@ -1,3 +1,8 @@
pyx.cookie_domain=.localhost
pyx.max_users=100
pyx.max_games=25
pyx.include_inactive_cardsets=true
# for production use, use postgres # for production use, use postgres
#hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect #hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
#hibernate.driver_class=org.postgresql.Driver #hibernate.driver_class=org.postgresql.Driver

4
src/main/filtered-resources/WEB-INF/pyx.properties Normal file
View File

@ -0,0 +1,4 @@
pyx.client.cookie_domain=${pyx.cookie_domain}
pyx.server.include_inactive_cardsets=${pyx.include_inactive_cardsets}
pyx.server.max_users=${pyx.max_users}
pyx.server.max_games=${pyx.max_games}

4
src/main/resources/WEB-INF/pyx.properties
View File

@ -1,4 +0,0 @@
pyx.client.cookie_domain=.socialgamer.net
pyx.server.include_inactive_cardsets=false
pyx.server.max_users=1000
pyx.server.max_games=225