Skip to content

Commit 11c1b01

Browse files
committed
Add converse-headless.js dist file and recipes
updates #1352
1 parent d919e81 commit 11c1b01

File tree

7 files changed

+71092
-190
lines changed

7 files changed

+71092
-190
lines changed

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,8 @@ logo/conversejs-filled%.png:: logo/conversejs-filled.svg
196196
BUILDS = dist/converse.js \
197197
dist/converse.min.js \
198198
dist/converse-headless.js \
199+
src/headless/dist/converse-headless.js \
200+
src/headless/dist/converse-headless.min.js \
199201
dist/converse-headless.min.js \
200202
dist/converse-no-dependencies.min.js \
201203
dist/converse-no-dependencies.js \
@@ -207,8 +209,12 @@ dist/converse.min.js: src webpack.config.js stamp-npm @converse/headless
207209
$(NPX) webpack --mode=production
208210
dist/converse-headless.js: src webpack.config.js stamp-npm @converse/headless
209211
$(NPX) webpack --mode=development --type=headless
212+
src/headless/dist/converse-headless.js: dist/converse-headless.js
213+
cp dist/converse-headless.js src/headless/dist/converse-headless.js
210214
dist/converse-headless.min.js: src webpack.config.js stamp-npm @converse/headless
211215
$(NPX) webpack --mode=production --type=headless
216+
src/headless/dist/converse-headless.min.js: dist/converse-headless.min.js
217+
cp dist/converse-headless.min.js src/headless/dist/converse-headless.min.js
212218
dist/converse-no-dependencies.js: src webpack.config.js stamp-npm @converse/headless
213219
$(NPX) webpack --mode=development --type=nodeps
214220
dist/converse-no-dependencies.min.js: src webpack.config.js stamp-npm @converse/headless
@@ -229,11 +235,14 @@ build:: dev css $(BUILDS)
229235

230236
.PHONY: eslint
231237
eslint: stamp-npm
232-
$(ESLINT) src/
238+
$(ESLINT) src/*.js
239+
$(ESLINT) src/utils/*.js
240+
$(ESLINT) src/headless/*.js
241+
$(ESLINT) src/headless/utils/*.js
233242
$(ESLINT) spec/
234243

235244
.PHONY: check
236-
check: dist/converse.js eslint
245+
check: eslint dist/converse.js
237246
LOG_CR_VERBOSITY=INFO $(CHROMIUM) --disable-gpu --no-sandbox http://localhost:$(HTTPSERVE_PORT)/tests/index.html
238247

239248
########################################################################

dist/converse.js

Lines changed: 164 additions & 154 deletions
Large diffs are not rendered by default.

src/converse-muc-views.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
//
44
// Copyright (c) 2013-2019, the Converse.js developers
55
// Licensed under the Mozilla Public License (MPLv2)
6+
//
7+
// XEP-0045 Multi-User Chat Views
68

79
import "converse-modal";
10+
import "backbone.overview/backbone.orderedlistview";
11+
import "backbone.overview/backbone.overview";
12+
import "backbone.vdomview";
813
import Awesomplete from "awesomplete";
914
import _FormData from "formdata-polyfill";
1015
import converse from "@converse/headless/converse-core";

src/headless/converse-core.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -439,27 +439,30 @@ function unregisterGlobalEventHandlers () {
439439
}
440440

441441
function cleanup () {
442-
// Looks like _converse.initialized was called again without logging
443-
// out or disconnecting in the previous session.
444-
// This happens in tests. We therefore first clean up.
445-
Backbone.history.stop();
446-
_converse.chatboxviews.closeAllChatBoxes();
447-
unregisterGlobalEventHandlers();
448-
window.localStorage.clear();
449-
window.sessionStorage.clear();
450-
if (_converse.bookmarks) {
451-
_converse.bookmarks.reset();
452-
}
453-
delete _converse.controlboxtoggle;
454-
delete _converse.chatboxviews;
455-
456-
_converse.connection.reset();
457-
_converse.tearDown();
458-
_converse.stopListening();
459-
_converse.off();
460-
461-
delete _converse.config;
462-
initClientConfig();
442+
// Looks like _converse.initialized was called again without logging
443+
// out or disconnecting in the previous session.
444+
// This happens in tests. We therefore first clean up.
445+
Backbone.history.stop();
446+
if (_converse.chatboxviews) {
447+
_converse.chatboxviews.closeAllChatBoxes();
448+
}
449+
unregisterGlobalEventHandlers();
450+
window.localStorage.clear();
451+
window.sessionStorage.clear();
452+
if (_converse.bookmarks) {
453+
_converse.bookmarks.reset();
454+
}
455+
delete _converse.controlboxtoggle;
456+
if (_converse.chatboxviews) {
457+
delete _converse.chatboxviews;
458+
}
459+
_converse.connection.reset();
460+
_converse.tearDown();
461+
_converse.stopListening();
462+
_converse.off();
463+
464+
delete _converse.config;
465+
initClientConfig();
463466
}
464467

465468

@@ -1195,9 +1198,6 @@ _converse.initialize = async function (settings, callback) {
11951198
};
11961199

11971200
this.tearDown = function () {
1198-
/* Remove those views which are only allowed with a valid
1199-
* connection.
1200-
*/
12011201
_converse.emit('beforeTearDown');
12021202
if (!_.isUndefined(_converse.session)) {
12031203
_converse.session.destroy();

src/headless/converse-muc.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
//
44
// Copyright (c) 2013-2019, the Converse.js developers
55
// Licensed under the Mozilla Public License (MPLv2)
6+
//
7+
// XEP-0045 Multi-User Chat
68

79
import "./converse-disco";
810
import "./utils/emoji";
911
import "./utils/muc";
10-
import "backbone.overview/backbone.orderedlistview";
11-
import "backbone.overview/backbone.overview";
12-
import "backbone.vdomview";
1312
import converse from "./converse-core";
1413
import u from "./utils/form";
1514

@@ -1314,11 +1313,15 @@ converse.plugins.add('converse-muc', {
13141313
}
13151314
}
13161315
if (result === true) {
1317-
const chatroom = _converse.openChatRoom(
1318-
room_jid, {'password': x_el.getAttribute('password') });
1316+
const chatroom = _converse.openChatRoom(room_jid, {'password': x_el.getAttribute('password') });
13191317

13201318
if (chatroom.get('connection_status') === converse.ROOMSTATUS.DISCONNECTED) {
1321-
_converse.chatboxviews.get(room_jid).join();
1319+
// XXX: Leaky abstraction from views here
1320+
if (_converse.chatboxviews) {
1321+
_converse.chatboxviews.get(room_jid).join();
1322+
} else {
1323+
_converse.chatboxes.get(room_jid).join();
1324+
}
13221325
}
13231326
}
13241327
};
@@ -1445,8 +1448,7 @@ converse.plugins.add('converse-muc', {
14451448
* Creates a new MUC chatroom (aka groupchat)
14461449
*
14471450
* Similar to {@link _converse.api.rooms.open}, but creates
1448-
* the chatroom in the background (i.e. doesn't cause a
1449-
* view to open).
1451+
* the chatroom in the background (i.e. doesn't cause a view to open).
14501452
*
14511453
* @method _converse.api.rooms.create
14521454
* @param {(string[]|string)} jid|jids The JID or array of

0 commit comments

Comments
 (0)