From 757a462a47bcdbc8bb9744d20edc4a959050ad36 Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Thu, 23 Feb 2017 21:39:26 +0200 Subject: [PATCH 1/2] Fixes #11 --- src/client/ui/templates/inventory/inventory.js | 14 ++++++++------ src/client/ui/templates/messages/styles.less | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/client/ui/templates/inventory/inventory.js b/src/client/ui/templates/inventory/inventory.js index 66ed9e8a..99f8b80f 100644 --- a/src/client/ui/templates/inventory/inventory.js +++ b/src/client/ui/templates/inventory/inventory.js @@ -282,14 +282,16 @@ define([ } } - if ((!item.quest) && (!item.eq)) { - if ((window.player.stash.active) && (!item.noSalvage)) - config.push(menuItems.stash); + if (!item.eq) { + if (!item.quest) { + if ((window.player.stash.active) && (!item.noSalvage)) + config.push(menuItems.stash); - config.push(menuItems.drop); + config.push(menuItems.drop); - if ((!item.material) && (!item.noSalvage)) - config.push(menuItems.salvage); + if ((!item.material) && (!item.noSalvage)) + config.push(menuItems.salvage); + } config.push(menuItems.destroy); } diff --git a/src/client/ui/templates/messages/styles.less b/src/client/ui/templates/messages/styles.less index e7af65a9..5a185235 100644 --- a/src/client/ui/templates/messages/styles.less +++ b/src/client/ui/templates/messages/styles.less @@ -14,6 +14,8 @@ pointer-events: none; &.typing { + pointer-events: all; + .el.message { display: block; } From 30614c36fcd88c797285b4618f39288fc683f0be Mon Sep 17 00:00:00 2001 From: Big Bad Waffle Date: Thu, 23 Feb 2017 21:49:14 +0200 Subject: [PATCH 2/2] Removed inventory changes that belongs to another issue --- src/client/ui/templates/inventory/inventory.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/client/ui/templates/inventory/inventory.js b/src/client/ui/templates/inventory/inventory.js index 99f8b80f..66ed9e8a 100644 --- a/src/client/ui/templates/inventory/inventory.js +++ b/src/client/ui/templates/inventory/inventory.js @@ -282,16 +282,14 @@ define([ } } - if (!item.eq) { - if (!item.quest) { - if ((window.player.stash.active) && (!item.noSalvage)) - config.push(menuItems.stash); + if ((!item.quest) && (!item.eq)) { + if ((window.player.stash.active) && (!item.noSalvage)) + config.push(menuItems.stash); - config.push(menuItems.drop); + config.push(menuItems.drop); - if ((!item.material) && (!item.noSalvage)) - config.push(menuItems.salvage); - } + if ((!item.material) && (!item.noSalvage)) + config.push(menuItems.salvage); config.push(menuItems.destroy); }