Quellcode durchsuchen

Merge branch 'revert-eacc84fa' into 'master'

Revert "another fix for #934"

See merge request Isleward/isleward!333
tags/v0.3.1
Big Bad Waffle vor 5 Jahren
Ursprung
Commit
4761321805
1 geänderte Dateien mit 2 neuen und 11 gelöschten Zeilen
  1. +2
    -11
      src/client/ui/templates/smithing/smithing.js

+ 2
- 11
src/client/ui/templates/smithing/smithing.js Datei anzeigen

@@ -21,13 +21,10 @@ define([
modal: true,

eventCloseInv: null,
eventClickInv: null,

hoverItem: null,
item: null,

waiting: false,

action: 'augment',

postRender: function () {
@@ -118,20 +115,17 @@ define([
},

openInventory: function () {
this.waiting = true;

this.eventCloseInv = this.onEvent('onHideInventory', this.onHideInventory.bind(this));
this.eventClickInv = this.onEvent('beforeInventoryClickItem', this.onHideInventory.bind(this));

events.emit('onShowInventory');
this.el.hide();
},

onHideInventory: function (msg) {
if (msg)
if (msg)
msg.success = false;

this.waiting = false;

if ((!msg) || (!msg.item)) {
this.offEvent(this.eventCloseInv);
this.offEvent(this.eventClickInv);
@@ -317,9 +311,6 @@ define([
},

beforeHide: function () {
if (this.waiting)
return;

this.item = null;
this.offEvent(this.eventCloseInv);
this.offEvent(this.eventClickInv);


Laden…
Abbrechen
Speichern