From f8311f3b503e1d32069ba42f57572f54e6e53bc0 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 22 Nov 2012 16:28:04 +0000 Subject: [PATCH] Work on new deck builder. --- .../src/main/webapp/deckBuild2.html | 172 ++++++++++++++++++ .../src/main/webapp/js/gemp-011/cardFilter.js | 8 +- .../main/webapp/js/gemp-011/deckBuildingUi.js | 2 +- .../webapp/js/gemp-011/deckBuildingUi2.js | 35 ++++ .../src/main/webapp/js/gemp-011/merchantUi.js | 2 +- 5 files changed, 213 insertions(+), 6 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-011/deckBuildingUi2.js diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html new file mode 100644 index 000000000..afe9e9070 --- /dev/null +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/deckBuild2.html @@ -0,0 +1,172 @@ + + + + Gemp-LotR + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+ + diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-011/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-011/cardFilter.js index 9c9f1f160..f53b1ceaa 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-011/cardFilter.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-011/cardFilter.js @@ -23,7 +23,7 @@ var CardFilter = Class.extend({ sortSelect:null, raritySelect:null, - init:function (elem, getCollectionFunc, clearCollectionFunc, addCardFunc, finishCollectionFunc) { + init:function (elem, pageElem, getCollectionFunc, clearCollectionFunc, addCardFunc, finishCollectionFunc) { this.getCollectionFunc = getCollectionFunc; this.clearCollectionFunc = clearCollectionFunc; this.addCardFunc = addCardFunc; @@ -31,7 +31,7 @@ var CardFilter = Class.extend({ this.filter = ""; - this.buildUi(elem); + this.buildUi(elem, pageElem); }, enableDetailFilters:function (enable) { @@ -52,7 +52,7 @@ var CardFilter = Class.extend({ $("#type").val(typeValue); }, - buildUi:function (elem) { + buildUi:function (elem, pageElem) { var that = this; this.pageDiv = $("
"); @@ -100,7 +100,7 @@ var CardFilter = Class.extend({ this.pageDiv.append(this.nextPageBut); this.pageDiv.append(this.countSlider); - elem.append(this.pageDiv); + pageElem.append(this.pageDiv); this.fullFilterDiv = $("
"); this.setSelect = $("