Commit d1618300 authored by JC Brand's avatar JC Brand

Make sure fullname is saved to localStorage

Also make sure that logged in user's fullname is fetched from xmppstatus obj.
parent 1d9dda37
...@@ -673,7 +673,7 @@ ...@@ -673,7 +673,7 @@
addContact: function (jid, name) { addContact: function (jid, name) {
converse.connection.roster.add(jid, name, [], function (iq) { converse.connection.roster.add(jid, name, [], function (iq) {
converse.connection.roster.subscribe(jid, null, converse.fullname); converse.connection.roster.subscribe(jid, null, converse.xmppstatus.get('fullname'));
}); });
} }
}); });
...@@ -1301,7 +1301,7 @@ ...@@ -1301,7 +1301,7 @@
var jid = this.model.get('jid'); var jid = this.model.get('jid');
converse.connection.roster.authorize(jid); converse.connection.roster.authorize(jid);
converse.connection.roster.add(jid, this.model.get('fullname'), [], function (iq) { converse.connection.roster.add(jid, this.model.get('fullname'), [], function (iq) {
converse.connection.roster.subscribe(jid, null, converse.fullname); converse.connection.roster.subscribe(jid, null, converse.xmppstatus.get('fullname'));
}); });
ev.preventDefault(); ev.preventDefault();
}, },
...@@ -1404,7 +1404,7 @@ ...@@ -1404,7 +1404,7 @@
fullname = $this.attr('name'); fullname = $this.attr('name');
if (action === 'add') { if (action === 'add') {
converse.connection.roster.add(jid, fullname, [], function (iq) { converse.connection.roster.add(jid, fullname, [], function (iq) {
converse.connection.roster.subscribe(jid, null, converse.fullname); converse.connection.roster.subscribe(jid, null, converse.xmppstatus.get('fullname'));
}); });
} }
}); });
...@@ -1455,11 +1455,11 @@ ...@@ -1455,11 +1455,11 @@
var bare_jid = Strophe.getBareJidFromJid(jid); var bare_jid = Strophe.getBareJidFromJid(jid);
if (converse.connection.roster.findItem(bare_jid)) { if (converse.connection.roster.findItem(bare_jid)) {
converse.connection.roster.authorize(bare_jid); converse.connection.roster.authorize(bare_jid);
converse.connection.roster.subscribe(jid, null, converse.fullname); converse.connection.roster.subscribe(jid, null, converse.xmppstatus.get('fullname'));
} else { } else {
converse.connection.roster.add(jid, '', [], function (iq) { converse.connection.roster.add(jid, '', [], function (iq) {
converse.connection.roster.authorize(bare_jid); converse.connection.roster.authorize(bare_jid);
converse.connection.roster.subscribe(jid, null, converse.fullname); converse.connection.roster.subscribe(jid, null, converse.xmppstatus.get('fullname'));
}); });
} }
}, },
...@@ -1753,7 +1753,8 @@ ...@@ -1753,7 +1753,8 @@
initialize: function () { initialize: function () {
this.set({ this.set({
'status' : this.get('status'), 'status' : this.get('status'),
'status_message' : this.get('status_message') 'status_message' : this.get('status_message'),
'fullname' : this.get('fullname')
}); });
}, },
...@@ -2138,7 +2139,7 @@ ...@@ -2138,7 +2139,7 @@
this.getVCard( this.getVCard(
null, // No 'to' attr when getting one's own vCard null, // No 'to' attr when getting one's own vCard
$.proxy(function (jid, fullname, image, image_type, url) { $.proxy(function (jid, fullname, image, image_type, url) {
this.xmppstatus.set({'fullname': fullname}); this.xmppstatus.save({'fullname': fullname});
}, this)); }, this));
} }
}, this) }, this)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment