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

Moving to new interface version.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-07-04 10:11:49 +00:00
parent b37519b6e4
commit 7897e1bb8e
24 changed files with 132 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild.html
View File

@@ -95,16 +95,16 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-007/common.js"></script>
<script type="text/javascript" src="js/gemp-007/communication.js"></script>
<script type="text/javascript" src="js/gemp-007/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
<script type="text/javascript" src="js/gemp-007/logging.js"></script>
<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-007/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-007/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-008/common.js"></script>
<script type="text/javascript" src="js/gemp-008/communication.js"></script>
<script type="text/javascript" src="js/gemp-008/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
<script type="text/javascript" src="js/gemp-008/logging.js"></script>
<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-008/deckBuildingUi.js"></script>
<script type="text/javascript" src="js/gemp-008/cardFilter.js"></script>
<script type="text/javascript">

20
gemp-lotr/gemp-lotr-web/src/main/webapp/game.html
View File

@@ -320,16 +320,16 @@ body {
<script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-007/communication.js"></script>
<script type="text/javascript" src="js/gemp-007/common.js"></script>
<script type="text/javascript" src="js/gemp-007/chat.js"></script>
<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-007/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-007/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
<script type="text/javascript" src="js/gemp-007/logging.js"></script>
<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-008/communication.js"></script>
<script type="text/javascript" src="js/gemp-008/common.js"></script>
<script type="text/javascript" src="js/gemp-008/chat.js"></script>
<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-008/gameUi.js"></script>
<script type="text/javascript" src="js/gemp-008/gameAnimations.js"></script>
<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
<script type="text/javascript" src="js/gemp-008/logging.js"></script>
<script type="text/javascript">
var ui;

36
gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html
View File

@@ -176,20 +176,20 @@
<script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
<script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-007/common.js"></script>
<script type="text/javascript" src="js/gemp-007/logging.js"></script>
<script type="text/javascript" src="js/gemp-007/chat.js"></script>
<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-007/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-007/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-007/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-007/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-007/communication.js"></script>
<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-008/common.js"></script>
<script type="text/javascript" src="js/gemp-008/logging.js"></script>
<script type="text/javascript" src="js/gemp-008/chat.js"></script>
<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-008/hallUi.js"></script>
<script type="text/javascript" src="js/gemp-008/leagueResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-008/tournamentResultsUi.js"></script>
<script type="text/javascript" src="js/gemp-008/gameHistoryUi.js"></script>
<script type="text/javascript" src="js/gemp-008/communication.js"></script>
<!-- This is needed for delivery -->
<script type="text/javascript" src="js/gemp-007/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
<script type="text/javascript" src="js/gemp-008/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
<script type="text/javascript">
var chat;
@@ -231,11 +231,11 @@
var infoDialog = $("<div></div>")
.dialog({
autoOpen:false,
closeOnEscape:true,
resizable:false,
title:"Card information"
});
autoOpen:false,
closeOnEscape:true,
resizable:false,
title:"Card information"
});
$("body").click(
function (event) {

6
gemp-lotr/gemp-lotr-web/src/main/webapp/index.html
View File

@@ -23,9 +23,9 @@
<script type="text/javascript" src="js/jquery/jquery-1.6.2.js"></script>
<script type="text/javascript" src="js/jquery/jquery-ui-1.8.16.custom.min.js"></script>
<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-007/logging.js"></script>
<script type="text/javascript" src="js/gemp-007/communication.js"></script>
<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-008/logging.js"></script>
<script type="text/javascript" src="js/gemp-008/communication.js"></script>
<script type="text/javascript">
function getUrlParam(param) {

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/cardFilter.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/cardFilter.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/chat.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/chat.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/common.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/common.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/commonUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/commonUi.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/communication.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/communication.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/deckBuildingUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/deckBuildingUi.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/deliveryService.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/deliveryService.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameAnimations.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameAnimations.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameHistoryUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameHistoryUi.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/gameUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/gameUi.js
View File

98
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/hallUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/hallUi.js
View File

@@ -49,15 +49,15 @@ var GempLotrHallUI = Class.extend({
var editDeck = $("<button>Deck builder</button>");
editDeck.button().click(
function () {
location.href = 'deckBuild.html';
});
function () {
location.href = 'deckBuild.html';
});
var merchant = $("<button>Merchant</button>");
merchant.button().click(
function () {
location.href = 'merchant.html';
});
function () {
location.href = 'merchant.html';
});
this.buttonsDiv.append(editDeck);
this.buttonsDiv.append(" | ");
@@ -74,17 +74,17 @@ var GempLotrHallUI = Class.extend({
this.createTableButton = $("<button>Create table</button>");
$(this.createTableButton).button().click(
function () {
that.supportedFormatsSelect.hide();
that.decksSelect.hide();
that.createTableButton.hide();
var format = that.supportedFormatsSelect.val();
var deck = that.decksSelect.val();
if (deck != null)
that.comm.createTable(format, deck, function (xml) {
that.processResponse(xml);
});
});
function () {
that.supportedFormatsSelect.hide();
that.decksSelect.hide();
that.createTableButton.hide();
var format = that.supportedFormatsSelect.val();
var deck = that.decksSelect.val();
if (deck != null)
that.comm.createTable(format, deck, function (xml) {
that.processResponse(xml);
});
});
this.createTableButton.hide();
this.decksSelect = $("<select style='width: 220px'></select>");
@@ -98,10 +98,10 @@ var GempLotrHallUI = Class.extend({
this.leaveTableButton = $("<button>Leave table</button>");
$(this.leaveTableButton).button().click(
function () {
that.leaveTableButton.hide();
that.comm.leaveTable();
});
function () {
that.leaveTableButton.hide();
that.comm.leaveTable();
});
this.leaveTableButton.hide();
this.buttonsDiv.append(this.leaveTableButton);
@@ -267,24 +267,24 @@ var GempLotrHallUI = Class.extend({
if (joined != "true") {
var but = $("<button>Join queue</button>");
$(but).button().click(
function (event) {
var deck = that.decksSelect.val();
if (deck != null)
that.comm.joinQueue(id, deck, function (xml) {
that.processResponse(xml);
});
});
function (event) {
var deck = that.decksSelect.val();
if (deck != null)
that.comm.joinQueue(id, deck, function (xml) {
that.processResponse(xml);
});
});
actionsField.append(but);
} else {
var but = $("<button>Leave queue</button>");
$(but).button().click(
function (event) {
var deck = that.decksSelect.val();
if (deck != null)
that.comm.leaveQueue(id, deck, function (xml) {
that.processResponse(xml);
});
});
function (event) {
var deck = that.decksSelect.val();
if (deck != null)
that.comm.leaveQueue(id, deck, function (xml) {
that.processResponse(xml);
});
});
actionsField.append(but);
}
@@ -319,13 +319,13 @@ var GempLotrHallUI = Class.extend({
if (!waiting) {
var but = $("<button>Join table</button>");
$(but).button().click(
function (event) {
var deck = that.decksSelect.val();
if (deck != null)
that.comm.joinTable(id, deck, function (xml) {
that.processResponse(xml);
});
});
function (event) {
var deck = that.decksSelect.val();
if (deck != null)
that.comm.joinTable(id, deck, function (xml) {
that.processResponse(xml);
});
});
actionsField.append(but);
}
}
@@ -333,13 +333,13 @@ var GempLotrHallUI = Class.extend({
if (status == "Playing" || status == "Preparation") {
var but = $("<button>Watch game</button>");
$(but).button().click(
function (event) {
var participantId = getUrlParam("participantId");
var participantIdAppend = "";
if (participantId != null)
participantIdAppend = "&participantId=" + participantId;
location.href = "/gemp-lotr/game.html?gameId=" + gameId + participantIdAppend;
});
function (event) {
var participantId = getUrlParam("participantId");
var participantIdAppend = "";
if (participantId != null)
participantIdAppend = "&participantId=" + participantId;
location.href = "/gemp-lotr/game.html?gameId=" + gameId + participantIdAppend;
});
actionsField.append(but);
}

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/inheritance.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/inheritance.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/jCardGroup.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/jCardGroup.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/jCards.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/jCards.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/leagueResultsUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/leagueResultsUi.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/logging.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/logging.js
View File

0
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/merchantUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/merchantUi.js
View File

48
gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/tournamentResultsUi.js → gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-008/tournamentResultsUi.js
View File

@@ -4,17 +4,17 @@ var TournamentResultsUI = Class.extend({
init:function (url) {
this.communication = new GempLotrCommunication(url,
function (xhr, ajaxOptions, thrownError) {
});
function (xhr, ajaxOptions, thrownError) {
});
this.formatDialog = $("<div></div>")
.dialog({
autoOpen:false,
closeOnEscape:true,
resizable:false,
modal:true,
title:"Format description"
});
.dialog({
autoOpen:false,
closeOnEscape:true,
resizable:false,
modal:true,
title:"Format description"
});
this.loadLiveTournaments();
},
@@ -22,17 +22,17 @@ var TournamentResultsUI = Class.extend({
loadLiveTournaments:function () {
var that = this;
this.communication.getLiveTournaments(
function (xml) {
that.loadedTournaments(xml);
});
function (xml) {
that.loadedTournaments(xml);
});
},
loadHistoryTournaments: function() {
loadHistoryTournaments:function () {
var that = this;
this.communication.getHistoryTournaments(
function (xml) {
that.loadedTournaments(xml);
});
function (xml) {
that.loadedTournaments(xml);
});
},
loadedTournament:function (xml) {
@@ -85,14 +85,14 @@ var TournamentResultsUI = Class.extend({
var detailsBut = $("<button>See details</button>").button();
detailsBut.click(
(function (id) {
return function () {
that.communication.getTournament(id,
function (xml) {
that.loadedTournament(xml);
});
};
})(tournamentId));
(function (id) {
return function () {
that.communication.getTournament(id,
function (xml) {
that.loadedTournament(xml);
});
};
})(tournamentId));
$("#tournamentResults").append(detailsBut);
}
if (tournaments.length == 0)

16
gemp-lotr/gemp-lotr-web/src/main/webapp/leagueAdmin.html
View File

@@ -34,14 +34,14 @@
<script type="text/javascript" src="js/jquery/jquery.spinnercontrol.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-007/communication.js"></script>
<script type="text/javascript" src="js/gemp-007/common.js"></script>
<script type="text/javascript" src="js/gemp-007/chat.js"></script>
<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
<script type="text/javascript" src="js/gemp-007/logging.js"></script>
<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-008/communication.js"></script>
<script type="text/javascript" src="js/gemp-008/common.js"></script>
<script type="text/javascript" src="js/gemp-008/chat.js"></script>
<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
<script type="text/javascript" src="js/gemp-008/logging.js"></script>
<script type="text/javascript">
function submitFormToAddress(url, formElem, success, error) {
var data = {};

20
gemp-lotr/gemp-lotr-web/src/main/webapp/merchant.html
View File

@@ -95,16 +95,16 @@
<script type="text/javascript" src="js/jquery/jquery.layout.js"></script>
<script type="text/javascript" src="js/jquery/jquery.touchSwipe.js"></script>
<script type="text/javascript" src="js/gemp-007/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-007/common.js"></script>
<script type="text/javascript" src="js/gemp-007/communication.js"></script>
<script type="text/javascript" src="js/gemp-007/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-007/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-007/jCards.js"></script>
<script type="text/javascript" src="js/gemp-007/logging.js"></script>
<script type="text/javascript" src="js/gemp-007/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-007/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-007/cardFilter.js"></script>
<script type="text/javascript" src="js/gemp-008/inheritance.js"></script>
<script type="text/javascript" src="js/gemp-008/common.js"></script>
<script type="text/javascript" src="js/gemp-008/communication.js"></script>
<script type="text/javascript" src="js/gemp-008/deliveryService.js"></script>
<script type="text/javascript" src="js/gemp-008/jCardGroup.js"></script>
<script type="text/javascript" src="js/gemp-008/jCards.js"></script>
<script type="text/javascript" src="js/gemp-008/logging.js"></script>
<script type="text/javascript" src="js/gemp-008/commonUi.js"></script>
<script type="text/javascript" src="js/gemp-008/merchantUi.js"></script>
<script type="text/javascript" src="js/gemp-008/cardFilter.js"></script>
<script type="text/javascript">