moparisthebest/kaiwa
1
0
Fork 0
mirror of https://github.com/moparisthebest/kaiwa synced 2024-11-26 03:02:25 -05:00
Code Issues Releases Wiki Activity

merge with master

Browse Source
This commit is contained in:
karolinaszczur 2013-09-25 12:24:02 +02:00
commit 159bfdf3fc
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientapp/libraries/stanza.io.js
View File

File diff suppressed because one or more lines are too long

9
clientapp/models/contact.js
View File

@ -53,6 +53,15 @@ module.exports = HumanModel.define({
return this.name || this.jid;
}
},
displayUnreadCount: {
deps: ['unreadCount'],
fn: function () {
if (this.unreadCount > 0) {
return this.unreadCount.toString();
}
return '';
}
},
formattedTZO: {
deps: ['timezoneOffset', 'displayName'],
fn: function () {

1
clientapp/models/message.js
View File

@ -45,7 +45,6 @@ module.exports = HumanModel.define({
deps: ['created'],
fn: function () {
if (this.created) {
console.log(this.created);
var month = this.created.getMonth();
var day = this.created.getDate();
var hour = this.created.getHours();

2
clientapp/views/contactListItem.js
View File

@ -18,7 +18,7 @@ module.exports = HumanView.extend({
textBindings: {
displayName: '.name',
status: '.status',
unreadCount: '.unread'
displayUnreadCount: '.unread'
},
srcBindings: {
avatar: '.avatar'