Browse Source

changed certain ui events to more specific ones

tags/v0.7.0^2
Shaun 4 years ago
parent
commit
723097192a
6 changed files with 10 additions and 12 deletions
  1. +2
    -3
      src/client/ui/templates/context/context.js
  2. +2
    -3
      src/client/ui/templates/passives/passives.js
  3. +2
    -2
      src/client/ui/templates/stash/stash.js
  4. +1
    -1
      src/client/ui/templates/wardrobe/wardrobe.js
  5. +1
    -1
      src/client/ui/templates/workbench/workbench.js
  6. +2
    -2
      src/client/ui/uiBase.js

+ 2
- 3
src/client/ui/templates/context/context.js View File

@@ -45,9 +45,8 @@ define([

if (c.callback) {
row.on('click', this.onClick.bind(this, i, c.callback));
row.on('click', events.emit.bind(events, 'onClickButton'));
}
else
row.on('click', events.emit.bind(events, 'onClickContextItem'));
} else
row.addClass('no-hover');
});



+ 2
- 3
src/client/ui/templates/passives/passives.js View File

@@ -150,7 +150,7 @@ define([
nodes.forEach(n => this.renderers.node.call(this, n, n.pos.x, n.pos.y));
},

onAfterShow: function() {
onAfterShow: function () {
//Calculate midpoint
let start = this.data.nodes.find(n => n.spiritStart === window.player.class);

@@ -168,7 +168,6 @@ define([
},

beforeHide: function () {
events.emit('onHideTooltip', this.el[0]);
events.emit('onHideTooltip', this.el[0]);
this.tooltipId = null;
},
@@ -439,7 +438,7 @@ define([
else if (isMobile && this.tooltipId !== node.id)
return;

events.emit('onTryTickPassiveNode', { tick: !node.selected })
events.emit('onTryTickPassiveNode', { tick: !node.selected });

client.request({
cpn: 'player',


+ 2
- 2
src/client/ui/templates/stash/stash.js View File

@@ -139,7 +139,7 @@ define([
this.build();
},

onAfterShow: function() {
onAfterShow: function () {
if ((!this.shown) && (!window.player.stash.active))
return;

@@ -147,7 +147,7 @@ define([
this.build();
},

beforeHide: function() {
beforeHide: function () {
if ((!this.shown) && (!window.player.stash.active))
return;



+ 1
- 1
src/client/ui/templates/wardrobe/wardrobe.js View File

@@ -41,7 +41,7 @@ define([
.appendTo(container);

el.on('click', this.setPreview.bind(this, l, el));
el.on('click', events.emit.bind(events, 'onClickButton'));
el.on('click', events.emit.bind(events, 'onClickListItem'));

if (l.id === window.player.skinId) {
el.addClass('current');


+ 1
- 1
src/client/ui/templates/workbench/workbench.js View File

@@ -74,7 +74,7 @@ define([
.appendTo(container);

el.on('click', this.onSelectRecipe.bind(this, el, r));
el.on('click', events.emit.bind(events, 'onClickButton'));
el.on('click', events.emit.bind(events, 'onClickListItem'));
}, this);
},



+ 2
- 2
src/client/ui/uiBase.js View File

@@ -45,12 +45,12 @@ define([
if ((this.centeredX) || (this.centeredY))
this.center(this.centeredX, this.centeredY);

this.registerUIEvents();
this.registerUiEvents();

this.shown = this.el.is(':visible');
},

registerUIEvents: function () {
registerUiEvents: function () {
this.find('.btn').on('click', events.emit.bind(events, 'onClickButton'));
this.find('.tab').on('click', events.emit.bind(events, 'onClickTab'));
},


Loading…
Cancel
Save