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

Shorten utils to u

Browse Source
This commit is contained in:
JC Brand 2018-02-19 10:34:52 +01:00
parent db85cb7f1d
commit 48c806c9d0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/converse-core.js
View File

@ -20,7 +20,7 @@
"backbone.nativeview", "backbone.nativeview",
"backbone.browserStorage" "backbone.browserStorage"
], factory); ], factory);
}(this, function (sizzle, Promise, _, f, polyfill, i18n, utils, moment, Strophe, pluggable, Backbone) { }(this, function (sizzle, Promise, _, f, polyfill, i18n, u, moment, Strophe, pluggable, Backbone) {
/* Cannot use this due to Safari bug. /* Cannot use this due to Safari bug.
* See https://github.com/jcbrand/converse.js/issues/196 * See https://github.com/jcbrand/converse.js/issues/196
@ -217,7 +217,7 @@
/* Private function, used to add a new promise to the ones already /* Private function, used to add a new promise to the ones already
* available via the `waitUntil` api method. * available via the `waitUntil` api method.
*/ */
_converse.promises[promise] = utils.getResolveablePromise(); _converse.promises[promise] = u.getResolveablePromise();
} }
_converse.emit = function (name) { _converse.emit = function (name) {
@ -235,7 +235,7 @@
_converse.initialize = function (settings, callback) { _converse.initialize = function (settings, callback) {
"use strict"; "use strict";
settings = !_.isUndefined(settings) ? settings : {}; settings = !_.isUndefined(settings) ? settings : {};
const init_promise = utils.getResolveablePromise(); const init_promise = u.getResolveablePromise();
_.each(PROMISES, addPromise); _.each(PROMISES, addPromise);
@ -617,7 +617,7 @@
this.initStatus = () => this.initStatus = () =>
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
const promise = new utils.getResolveablePromise(); const promise = new u.getResolveablePromise();
this.xmppstatus = new this.XMPPStatus(); this.xmppstatus = new this.XMPPStatus();
const id = b64_sha1(`converse.xmppstatus-${_converse.bare_jid}`); const id = b64_sha1(`converse.xmppstatus-${_converse.bare_jid}`);
this.xmppstatus.id = id; // Appears to be necessary for backbone.browserStorage this.xmppstatus.id = id; // Appears to be necessary for backbone.browserStorage
@ -1142,7 +1142,7 @@
}, },
isSelf (jid) { isSelf (jid) {
return utils.isSameBareJID(jid, _converse.connection.jid); return u.isSameBareJID(jid, _converse.connection.jid);
}, },
addAndSubscribe (jid, name, groups, message, attributes) { addAndSubscribe (jid, name, groups, message, attributes) {
@ -1921,9 +1921,9 @@
}, },
'settings': { 'settings': {
'update' (settings) { 'update' (settings) {
utils.merge(_converse.default_settings, settings); u.merge(_converse.default_settings, settings);
utils.merge(_converse, settings); u.merge(_converse, settings);
utils.applyUserSettings(_converse, settings, _converse.user_settings); u.applyUserSettings(_converse, settings, _converse.user_settings);
}, },
'get' (key) { 'get' (key) {
if (_.includes(_.keys(_converse.default_settings), key)) { if (_.includes(_.keys(_converse.default_settings), key)) {
@ -2045,7 +2045,7 @@
'b64_sha1': b64_sha1, 'b64_sha1': b64_sha1,
'moment': moment, 'moment': moment,
'sizzle': sizzle, 'sizzle': sizzle,
'utils': utils 'utils': u
} }
}; };
window.dispatchEvent(new Event('converse-loaded')); window.dispatchEvent(new Event('converse-loaded'));