Explorar el Código

Merge branch '93-duplicate-party-display' into 'staging'

Prevent duplicate party members

See merge request !55
tags/v0.1.2^2
Big Bad Waffle hace 7 años
padre
commit
a9080799a8
Se han modificado 2 ficheros con 8 adiciones y 1 borrados
  1. +4
    -0
      src/client/ui/templates/party/party.js
  2. +4
    -1
      src/server/components/social.js

+ 4
- 0
src/client/ui/templates/party/party.js Ver fichero

@@ -100,6 +100,10 @@ define([
},

onGetParty: function(party) {
// Destroy invite frame if you join a party
if (this.invite)
this.destroyInvite();

var container = this.find('.party .list')
.empty();



+ 4
- 1
src/server/components/social.js Ver fichero

@@ -181,7 +181,10 @@ define([
this.updatePartyOnThread();
}

this.party.push(sourceId);
// Only add if not yet in party
if (!this.party.find(id => (id === sourceId)))
this.party.push(sourceId);

this.updatePartyOnThread();

this.party.forEach(function(p) {


Cargando…
Cancelar
Guardar