diff --git a/parcel/lib/room-controller.js b/parcel/lib/room-controller.js index 1f19a1f..b8df304 100644 --- a/parcel/lib/room-controller.js +++ b/parcel/lib/room-controller.js @@ -47,8 +47,8 @@ export default class RoomController{ this[type].current = room.id; /* (5) Tell websocket: new text room */ - if( type === 'text' && window.csock instanceof wscd ) - csock.send({ buffer: { rid: room.id } }); + if( typeof this[type].current === 'number' && window.csock instanceof wscd ) + (type === 'text') && csock.send({ buffer: { rid: room.id } }); /* (6) If 'voice' room -> toggle audio */ if( type === 'voice' ){ diff --git a/parcel/scss/dialog.scss b/parcel/scss/dialog.scss index f115ae8..b2f26b5 100644 --- a/parcel/scss/dialog.scss +++ b/parcel/scss/dialog.scss @@ -182,7 +182,7 @@ display: none; position: absolute; - top: calc( 50% - 1em/2 ); + top: calc( .5em ); left: calc( 100% - .5em - 1em ); width: 1em; height: 1em; @@ -196,6 +196,45 @@ // only show 'remove' icon on hover &:hover > span.rem{ display: block; } + + // Member List + & > div.member-list{ + + display: block; + position: relative; + width: calc( 100% - 1em ); + + overflow: hidden; + + & > span{ + + display: inline-block; + position: relative; + + & > span{ + display: inline-block; + position: relative; + + margin-top: -1.9em; + + } + + div.icon{ + display: inline-block; + position: relative; + width: 1.2em; + height: 1.2em; + + margin: .2em .5em; + margin-left: 0; + + border-radius: 50% / 50%; + + background-color: url() center center no-repeat; + background-size: contain; + } + } + } } } diff --git a/parcel/vue/auth/dialog.vue b/parcel/vue/auth/dialog.vue index 95a6cc2..e05212a 100644 --- a/parcel/vue/auth/dialog.vue +++ b/parcel/vue/auth/dialog.vue @@ -35,6 +35,12 @@ :data-type='r.type' @click='gs.room.nav(r.type, r.id)'>{{ r.name }} +
+ +
+ {{ gs.content.user(uid).username }} +
+