From ad142028caef6703aa23ce1fa2db4ba1e9984d47 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 5 Oct 2018 04:44:15 +0200 Subject: [PATCH] Updated builds --- css/converse.css | 1 + dist/converse.js | 80 +++++++++++++++++++++++++++++++----------------- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/css/converse.css b/css/converse.css index e16c97c44..45b73cc93 100644 --- a/css/converse.css +++ b/css/converse.css @@ -9637,6 +9637,7 @@ body.reset { width: 100%; overflow: hidden; } #conversejs.converse-fullscreen .chatbox .chat-body { + height: calc(100% - 62px); background-color: #3AA569; border-top-left-radius: 4px; border-top-right-radius: 4px; } diff --git a/dist/converse.js b/dist/converse.js index 4a888f6bc..5e181ebe8 100644 --- a/dist/converse.js +++ b/dist/converse.js @@ -59261,25 +59261,23 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ __ = _converse.__, body = this.el.querySelector('.chatroom-body'); - _.each(body.children, function (child) { - child.classList.add('hidden'); - }); // Remove any existing forms - + _.each(body.children, child => child.classList.add('hidden')); _.each(body.querySelectorAll('.chatroom-form-container'), u.removeElement); body.insertAdjacentHTML('beforeend', tpl_chatroom_bookmark_form({ - heading: __('Bookmark this groupchat'), - label_name: __('The name for this bookmark:'), - label_autojoin: __('Would you like this groupchat to be automatically joined upon startup?'), - label_nick: __('What should your nickname for this groupchat be?'), - default_nick: this.model.get('nick'), - label_submit: __('Save'), - label_cancel: __('Cancel') + 'default_nick': this.model.get('nick'), + 'heading': __('Bookmark this groupchat'), + 'label_autojoin': __('Would you like this groupchat to be automatically joined upon startup?'), + 'label_cancel': __('Cancel'), + 'label_name': __('The name for this bookmark:'), + 'label_nick': __('What should your nickname for this groupchat be?'), + 'label_submit': __('Save'), + 'name': this.model.get('name') })); const form = body.querySelector('form.chatroom-form'); - form.addEventListener('submit', this.onBookmarkFormSubmitted.bind(this)); - form.querySelector('.button-cancel').addEventListener('click', this.closeForm.bind(this)); + form.addEventListener('submit', ev => this.onBookmarkFormSubmitted(ev)); + form.querySelector('.button-cancel').addEventListener('click', () => this.closeForm()); }, onBookmarkFormSubmitted(ev) { @@ -65650,11 +65648,37 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ }).then(result => f.filter(f.isObject, result)); }, + /** + * Refresh the features (and fields and identities) associated with a + * disco entity by refetching them from the server + * + * @method _converse.api.disco.refreshFeatures + * @param {string} jid The JID of the entity whose features are refreshed. + * @returns {promise} A promise which resolves once the features have been refreshed + * @example + * await _converse.api.disco.refreshFeatures('room@conference.example.org'); + */ + 'refreshFeatures'(jid) { + if (_.isNil(jid)) { + throw new TypeError('api.disco.refreshFeatures: You need to provide an entity JID'); + } + + return _converse.api.waitUntil('discoInitialized').then(() => _converse.api.disco.entities.get(jid, true)).then(entity => { + entity.features.reset(); + entity.fields.reset(); + entity.identities.reset(); + entity.waitUntilFeaturesDiscovered = utils.getResolveablePromise(); + entity.queryInfo(); + return entity.waitUntilFeaturesDiscovered(); + }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL)); + }, + /** * Return all the features associated with a disco entity * * @method _converse.api.disco.getFeatures * @param {string} jid The JID of the entity whose features are returned. + * @returns {promise} A promise which resolves with the returned features * @example * const features = await _converse.api.disco.getFeatures('room@conference.example.org'); */ @@ -69465,13 +69489,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_ _.each(this.el.querySelectorAll('.spinner'), u.removeElement); + _.each(this.el.querySelectorAll('.chatroom-form-container'), u.removeElement); + container_el.insertAdjacentHTML('beforeend', tpl_chatroom_password_form({ - heading: __('This groupchat requires a password'), - label_password: __('Password: '), - label_submit: __('Submit') + 'heading': __('This groupchat requires a password'), + 'label_password': __('Password: '), + 'label_submit': __('Submit') })); this.model.save('connection_status', converse.ROOMSTATUS.PASSWORD_REQUIRED); - this.el.querySelector('.chatroom-form').addEventListener('submit', this.submitPassword.bind(this), false); + this.el.querySelector('.chatroom-form').addEventListener('submit', ev => this.submitPassword(ev), false); }, showDisconnectMessages(msgs) { @@ -70345,12 +70371,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } dependencies: ["converse-chatboxes", "converse-disco", "converse-controlbox"], overrides: { tearDown() { - const groupchats = this.chatboxes.where({ - 'type': this.CHATROOMS_TYPE + const _converse = this.__super__._converse, + groupchats = this.chatboxes.where({ + 'type': _converse.CHATROOMS_TYPE }); _.each(groupchats, gc => u.safeSave(gc, { - 'connection_status': this.ROOMSTATUS.DISCONNECTED + 'connection_status': converse.ROOMSTATUS.DISCONNECTED })); this.__super__.tearDown.call(this, arguments); @@ -70817,13 +70844,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } }); }, - refreshRoomFeatures() { - const entity = _converse.disco_entities.get(this.get('jid')); - - if (entity) { - entity.destroy(); - } - + async refreshRoomFeatures() { + await _converse.api.disco.refreshFeatures(this.get('jid')); return this.getRoomFeatures(); }, @@ -78550,7 +78572,9 @@ __p += '\n
\n \n \n \n
\n \n \n
\n
\n \n