From ef421be80a796141b53ef5c2f081f1e91b3022f3 Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Mon, 27 Feb 2017 20:12:33 +0200 Subject: [PATCH] Fixes #88 --- src/client/ui/templates/trade/template.html | 7 +++++++ src/client/ui/templates/trade/trade.js | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/client/ui/templates/trade/template.html b/src/client/ui/templates/trade/template.html index 97d46e58..07bfd98b 100644 --- a/src/client/ui/templates/trade/template.html +++ b/src/client/ui/templates/trade/template.html @@ -1,3 +1,10 @@
+
+
trade
+
+
+
+
+
\ No newline at end of file diff --git a/src/client/ui/templates/trade/trade.js b/src/client/ui/templates/trade/trade.js index 3aebcea8..33e0b0ff 100644 --- a/src/client/ui/templates/trade/trade.js +++ b/src/client/ui/templates/trade/trade.js @@ -23,6 +23,8 @@ define([ }, onGetTradeList: function(itemList, action) { + this.find('.heading-text').html(action); + var uiInventory = $('.uiInventory').data('ui'); var container = this.el.find('.grid') @@ -54,8 +56,14 @@ define([ return 0; }); - var iLen = buyItems.length; + var iLen = Math.max(buyItems.length, 50); for (var i = 0; i < iLen; i++) { + if (!buyItems[i]) { + $(tplItem).appendTo(container); + + continue; + } + var item = $.extend(true, {}, buyItems[i]); item.worth = ~~(itemList.markup * item.worth); @@ -74,7 +82,7 @@ define([ } var imgX = (-item.sprite[0] * size) + offset; - var imgY = (-item.sprite[1] * size) + offset + 4; + var imgY = (-item.sprite[1] * size) + offset; var itemEl = $(tplItem) .appendTo(container);