--- a/coffee/contacts.coffee Wed Mar 23 16:55:52 2016 +0800
+++ b/coffee/contacts.coffee Wed Mar 23 16:59:04 2016 +0800
- @on 'add change:fullname change:nickname change:jid', ->
- @set('d/handle', @get('fullname') or @get('nickname') or @get('jid'))
+ @on 'add change:fullname change:nickname change:bjid', ->
+ @set('d/handle', @get('fullname') or @get('nickname') or @get('bjid'))
@on 'add change:show change:presence', ->
@set('d/pip', if @has('show') then @get('show') else @get('presence'))
--- a/js/contacts.js Wed Mar 23 16:55:52 2016 +0800
+++ b/js/contacts.js Wed Mar 23 16:59:04 2016 +0800
return this.unset('d/avatar');
- this.on('add change:fullname change:nickname change:jid', function() {
- return this.set('d/handle', this.get('fullname') || this.get('nickname') || this.get('jid'));
+ this.on('add change:fullname change:nickname change:bjid', function() {
+ return this.set('d/handle', this.get('fullname') || this.get('nickname') || this.get('bjid'));
return this.on('add change:show change:presence', function() {
return this.set('d/pip', this.has('show') ? this.get('show') : this.get('presence'));
--- a/js/contacts.js.map Wed Mar 23 16:55:52 2016 +0800
+++ b/js/contacts.js.map Wed Mar 23 16:59:04 2016 +0800
- "mappings": "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"
+ "mappings": "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"
\ No newline at end of file