Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

utils: Rename saveWithFallback to safeSave

Browse Source
This commit is contained in:
JC Brand 2017-06-23 20:16:16 +02:00
parent 86c20ce2a7
commit 36e078c9f6
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/converse-chatview.js
View File

@ -839,7 +839,7 @@
scrolled = false; scrolled = false;
this.onScrolledDown(); this.onScrolledDown();
} }
utils.saveWithFallback(this.model, {'scrolled': scrolled}); utils.safeSave(this.model, {'scrolled': scrolled});
}, 150), }, 150),
viewUnreadMessages: function () { viewUnreadMessages: function () {

4
src/converse-minimize.js
View File

@ -71,14 +71,14 @@
}, },
maximize: function () { maximize: function () {
utils.saveWithFallback(this, { utils.safeSave(this, {
'minimized': false, 'minimized': false,
'time_opened': moment().valueOf() 'time_opened': moment().valueOf()
}); });
}, },
minimize: function () { minimize: function () {
utils.saveWithFallback(this, { utils.safeSave(this, {
'minimized': true, 'minimized': true,
'time_minimized': moment().format() 'time_minimized': moment().format()
}); });

16
src/converse-muc.js
View File

@ -137,7 +137,7 @@
_tearDown: function () { _tearDown: function () {
var rooms = this.chatboxes.where({'type': CHATROOMS_TYPE}); var rooms = this.chatboxes.where({'type': CHATROOMS_TYPE});
_.each(rooms, function (room) { _.each(rooms, function (room) {
room.save({'connection_status': ROOMSTATUS.DISCONNECTED}); utils.safeSave(room, {'connection_status': ROOMSTATUS.DISCONNECTED});
}); });
this.__super__._tearDown.call(this, arguments); this.__super__._tearDown.call(this, arguments);
}, },
@ -419,7 +419,7 @@
}, },
clearUnreadMsgCounter: function() { clearUnreadMsgCounter: function() {
utils.saveWithFallback(this, { utils.safeSave(this, {
'num_unread': 0, 'num_unread': 0,
'num_unread_general': 0 'num_unread_general': 0
}); });
@ -1259,11 +1259,10 @@
if (_converse.connection.connected) { if (_converse.connection.connected) {
this.sendUnavailablePresence(exit_msg); this.sendUnavailablePresence(exit_msg);
} }
if (utils.isPersistableModel(this.model)) { utils.safeSave(
this.model.save('connection_status', ROOMSTATUS.DISCONNECTED); this.model,
} else { {'connection_status': ROOMSTATUS.DISCONNECTED}
this.model.set('connection_status', ROOMSTATUS.DISCONNECTED); );
}
this.removeHandlers(); this.removeHandlers();
_converse.ChatBoxView.prototype.close.apply(this, arguments); _converse.ChatBoxView.prototype.close.apply(this, arguments);
}, },
@ -1276,7 +1275,8 @@
* either submitted the form, or canceled it. * either submitted the form, or canceled it.
* *
* Parameters: * Parameters:
* (XMLElement) stanza: The IQ stanza containing the room config. * (XMLElement) stanza: The IQ stanza containing the room
* config.
*/ */
var that = this, var that = this,
$body = this.$('.chatroom-body'); $body = this.$('.chatroom-body');

8
src/utils.js
View File

@ -526,11 +526,11 @@
return model.collection && model.collection.browserStorage; return model.collection && model.collection.browserStorage;
} }
utils.saveWithFallback = function (model, attrs) { utils.safeSave = function (model, attributes) {
if (utils.isPersistableModel(this)) { if (utils.isPersistableModel(model)) {
model.save(attrs); model.save(attributes);
} else { } else {
model.set(attrs); model.set(attributes);
} }
} }
return utils; return utils;