aboutsummaryrefslogtreecommitdiffstats
path: root/js/shop.js
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2016-04-25 19:10:53 +0200
committerpiernov <piernov@piernov.org>2016-04-25 19:10:53 +0200
commit8770f9ddccfafaad935f66ccbf254624b41545f3 (patch)
treee07d2e93e95a34e9f70f22f52aafa82c09682e4b /js/shop.js
parentb141eb3d70b3dc2d75ee8f2bf2edba1fed71f5b6 (diff)
parent8140617aeb2f32f7095a443ca743c6d6915739c6 (diff)
downloadcandybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.gz
candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.bz2
candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.tar.xz
candybox-8770f9ddccfafaad935f66ccbf254624b41545f3.zip
Merge remote-tracking branch 'origin/alexichi' into piernov
Diffstat (limited to 'js/shop.js')
-rw-r--r--js/shop.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/shop.js b/js/shop.js
index 00636e1..22ca85f 100644
--- a/js/shop.js
+++ b/js/shop.js
@@ -25,7 +25,7 @@ function buildShop() {
function addItem(ret) {
var itemhtml = "<li>";
- itemhtml += "<button type=\"submit\" class=\"btn btn-primary\" onclick=\"useItem('" + ret.name + "')\"><span class=\"item-icon\">" + ret.icon + "</span><br />" + ret.name + "</button>";
+ itemhtml += "<button type=\"button\" class=\"btn btn-primary\" onclick=\"useItem('" + ret.name + "')\"><span class=\"item-icon\">" + ret.icon + "</span><br />" + ret.name + "</button>";
itemhtml += "</li>";
var invcontent = document.getElementById("tab3");