Skip to content

C
converse.js
Commit 910e9bdd authored by JC Brand's avatar JC Brand
Browse files
Options

Refactoring in MUC 

What started as an attempt to fix a bug in parseXUserElement, turned into
another large refactoring of MUC code, and it's not clear how to break this up
into multiple atomic commits. So I'm just pushing it all.

At least there are two new tests added to the suite.
parent 8bbd88ba
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 231 additions and 69 deletions
config.js
View file @ 910e9bdd
...@@ -135,7 +135,9 @@ require.config({ ...@@ -135,7 +135,9 @@ require.config({
"chatbox_minimize": "src/templates/chatbox_minimize", "chatbox_minimize": "src/templates/chatbox_minimize",
"chatroom": "src/templates/chatroom", "chatroom": "src/templates/chatroom",
"chatroom_bookmark_form": "src/templates/chatroom_bookmark_form", "chatroom_bookmark_form": "src/templates/chatroom_bookmark_form",
"chatroom_bookmark_toggle": "src/templates/chatroom_bookmark_toggle",
"chatroom_form": "src/templates/chatroom_form", "chatroom_form": "src/templates/chatroom_form",
"chatroom_head": "src/templates/chatroom_head",
"chatroom_nickname_form": "src/templates/chatroom_nickname_form", "chatroom_nickname_form": "src/templates/chatroom_nickname_form",
"chatroom_password_form": "src/templates/chatroom_password_form", "chatroom_password_form": "src/templates/chatroom_password_form",
"chatroom_sidebar": "src/templates/chatroom_sidebar", "chatroom_sidebar": "src/templates/chatroom_sidebar",
...@@ -147,6 +149,7 @@ require.config({ ...@@ -147,6 +149,7 @@ require.config({
"contacts_tab": "src/templates/contacts_tab", "contacts_tab": "src/templates/contacts_tab",
"controlbox": "src/templates/controlbox", "controlbox": "src/templates/controlbox",
"controlbox_toggle": "src/templates/controlbox_toggle", "controlbox_toggle": "src/templates/controlbox_toggle",
"dragresize": "src/templates/dragresize",
"field": "src/templates/field", "field": "src/templates/field",
"form_captcha": "src/templates/form_captcha", "form_captcha": "src/templates/form_captcha",
"form_checkbox": "src/templates/form_checkbox", "form_checkbox": "src/templates/form_checkbox",
......
spec/chatroom.js
View file @ 910e9bdd
...@@ -155,6 +155,36 @@ ...@@ -155,6 +155,36 @@
expect(view instanceof converse.ChatRoomView).toBe(true); expect(view instanceof converse.ChatRoomView).toBe(true);
})); }));
it("can be configured if you're its owner", mock.initConverse(function (converse) {
converse_api.rooms.open('room@conference.example.org', {'nick': 'some1'});
var view = converse.chatboxviews.get('room@conference.example.org');
spyOn(view, 'showConfigureButtonIfRoomOwner').andCallThrough();
/* <presence to="dummy@localhost/converse.js-29092160"
* from="room@conference.example.org/some1">
* <x xmlns="http://jabber.org/protocol/muc#user">
* <item affiliation="owner" jid="dummy@localhost/converse.js-29092160" role="moderator"/>
* <status code="110"/>
* </x>
* </presence></body>
*/
var presence = $pres({
to: 'dummy@localhost/converse.js-29092160',
from: 'room@conference.example.org/some1'
}).c('x', {xmlns: Strophe.NS.MUC_USER})
.c('item', {
'affiliation': 'owner',
'jid': 'dummy@localhost/converse.js-29092160',
'role': 'moderator'
}).up()
.c('status', {code: '110'});
converse.connection._dataRecv(test_utils.createRequest(presence));
expect(view.showConfigureButtonIfRoomOwner).toHaveBeenCalled();
expect(view.$('.configure-chatroom-button').is(':visible')).toBeTruthy();
expect(view.$('.toggle-chatbox-button').is(':visible')).toBeTruthy();
expect(view.$('.toggle-bookmark').is(':visible')).toBeTruthy();
}));
it("shows users currently present in the room", mock.initConverse(function (converse) { it("shows users currently present in the room", mock.initConverse(function (converse) {
test_utils.openAndEnterChatRoom(converse, 'lounge', 'localhost', 'dummy'); test_utils.openAndEnterChatRoom(converse, 'lounge', 'localhost', 'dummy');
var name; var name;
...@@ -575,6 +605,43 @@ ...@@ -575,6 +605,43 @@
expect($occupants.children().first(0).text()).toBe("newnick"); expect($occupants.children().first(0).text()).toBe("newnick");
})); }));
it("indicates when a room is no longer anonymous", mock.initConverse(function (converse) {
converse_api.rooms.open('room@conference.example.org', {
'nick': 'some1',
'roomconfig': {
'changesubject': false,
'membersonly': true,
'persistentroom': true,
'publicroom': true,
'roomdesc': 'Welcome to this room',
'whois': 'anyone'
}
});
/* <message xmlns="jabber:client"
* type="groupchat"
* to="dummy@localhost/converse.js-27854181"
* from="room@conference.example.org">
* <x xmlns="http://jabber.org/protocol/muc#user">
* <status code="104"/>
* <status code="172"/>
* </x>
* </message>
*/
var message = $msg({
type:'groupchat',
to: 'dummy@localhost/converse.js-27854181',
from: 'room@conference.example.org'
}).c('x', {xmlns: Strophe.NS.MUC_USER})
.c('status', {code: '104'}).up()
.c('status', {code: '172'});
converse.connection._dataRecv(test_utils.createRequest(message));
var view = converse.chatboxviews.get('room@conference.example.org');
var $chat_body = view.$('.chatroom-body');
expect($chat_body.html().trim().indexOf(
'<div class="chat-info">This room is now no longer anonymous</div>'
)).not.toBe(-1);
}));
it("informs users if they have been kicked out of the chat room", mock.initConverse(function (converse) { it("informs users if they have been kicked out of the chat room", mock.initConverse(function (converse) {
/* <presence /* <presence
* from='harfleur@chat.shakespeare.lit/pistol' * from='harfleur@chat.shakespeare.lit/pistol'
......
src/converse-bookmarks.js
View file @ 910e9bdd
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
"converse-api", "converse-api",
"converse-muc", "converse-muc",
"tpl!chatroom_bookmark_form", "tpl!chatroom_bookmark_form",
"tpl!chatroom_bookmark_toggle",
"tpl!bookmark", "tpl!bookmark",
"tpl!bookmarks_list" "tpl!bookmarks_list"
], ],
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
$, _, moment, strophe, utils, $, _, moment, strophe, utils,
converse, converse_api, muc, converse, converse_api, muc,
tpl_chatroom_bookmark_form, tpl_chatroom_bookmark_form,
tpl_chatroom_bookmark_toggle,
tpl_bookmark, tpl_bookmark,
tpl_bookmarks_list tpl_bookmarks_list
) { ) {
...@@ -40,6 +42,7 @@ ...@@ -40,6 +42,7 @@
// Add new HTML templates. // Add new HTML templates.
converse.templates.chatroom_bookmark_form = tpl_chatroom_bookmark_form; converse.templates.chatroom_bookmark_form = tpl_chatroom_bookmark_form;
converse.templates.chatroom_bookmark_toggle = tpl_chatroom_bookmark_toggle;
converse.templates.bookmark = tpl_bookmark; converse.templates.bookmark = tpl_bookmark;
converse.templates.bookmarks_list = tpl_bookmarks_list; converse.templates.bookmarks_list = tpl_bookmarks_list;
...@@ -69,16 +72,24 @@ ...@@ -69,16 +72,24 @@
this.setBookmarkState(); this.setBookmarkState();
}, },
render: function (options) { generateHeadingHTML: function () {
this.__super__.render.apply(this, arguments); var html = this.__super__.generateHeadingHTML.apply(this, arguments);
if (converse.allow_bookmarks) { if (converse.allow_bookmarks) {
var label_bookmark = _('Bookmark this room'); var div = document.createElement('div');
var button = '<a class="chatbox-btn toggle-bookmark icon-pushpin '+ div.innerHTML = html;
(this.model.get('bookmarked') ? 'button-on"' : '"') + var bookmark_button = converse.templates.chatroom_bookmark_toggle(
'title="'+label_bookmark+'"></a>'; _.extend(
this.$el.find('.chat-head-chatroom .icon-wrench').before(button); this.model.toJSON(),
{
info_toggle_bookmark: __('Bookmark this room'),
bookmarked: this.model.get('bookmarked')
}
));
var close_button = div.querySelector('.close-chatbox-button');
close_button.insertAdjacentHTML('afterend', bookmark_button);
return div.innerHTML;
} }
return this; return html;
}, },
checkForReservedNick: function () { checkForReservedNick: function () {
......
src/converse-dragresize.js
View file @ 910e9bdd
...@@ -10,14 +10,16 @@ ...@@ -10,14 +10,16 @@
define("converse-dragresize", [ define("converse-dragresize", [
"converse-core", "converse-core",
"converse-api", "converse-api",
"tpl!dragresize",
"converse-chatview", "converse-chatview",
"converse-muc", // XXX: would like to remove this "converse-muc", // XXX: would like to remove this
"converse-controlbox" "converse-controlbox"
], factory); ], factory);
}(this, function (converse, converse_api) { }(this, function (converse, converse_api, tpl_dragresize) {
"use strict"; "use strict";
var $ = converse_api.env.jQuery, var $ = converse_api.env.jQuery,
_ = converse_api.env._; _ = converse_api.env._;
converse.templates.dragresize = tpl_dragresize;
converse_api.plugins.add('converse-dragresize', { converse_api.plugins.add('converse-dragresize', {
...@@ -260,13 +262,23 @@ ...@@ -260,13 +262,23 @@
render: function () { render: function () {
var result = this.__super__.render.apply(this, arguments); var result = this.__super__.render.apply(this, arguments);
this.renderDragResizeHandles();
this.setWidth(); this.setWidth();
return result; return result;
},
renderDragResizeHandles: function () {
var flyout = this.el.querySelector('.box-flyout');
var div = document.createElement('div');
div.innerHTML = converse.templates.dragresize();
flyout.insertBefore(
div.firstChild,
flyout.firstChild
);
} }
} }
}, },
initialize: function () { initialize: function () {
/* The initialize function gets called as soon as the plugin is /* The initialize function gets called as soon as the plugin is
* loaded by converse.js's plugin machinery. * loaded by converse.js's plugin machinery.
......
src/converse-headline.js
View file @ 910e9bdd
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
title: this.model.get('fullname'), title: this.model.get('fullname'),
unread_msgs: __('You have unread messages'), unread_msgs: __('You have unread messages'),
info_close: __('Close this box'), info_close: __('Close this box'),
info_minimize: __('Minimize this box'),
label_personal_message: '' label_personal_message: ''
} }
) )
......
src/converse-minimize.js
View file @ 910e9bdd
...@@ -181,6 +181,18 @@ ...@@ -181,6 +181,18 @@
this.hide(); this.hide();
} }
return result; return result;
},
generateHeadingHTML: function () {
var html = this.__super__.generateHeadingHTML.apply(this, arguments);
var div = document.createElement('div');
div.innerHTML = html;
var el = converse.templates.chatbox_minimize(
{info_minimize: __('Minimize this chat box')}
);
var button = div.querySelector('.close-chatbox-button');
button.insertAdjacentHTML('afterend', el);
return div.innerHTML;
} }
}, },
...@@ -497,7 +509,7 @@ ...@@ -497,7 +509,7 @@
// Inserts a "minimize" button in the chatview's header // Inserts a "minimize" button in the chatview's header
var $el = view.$el.find('.toggle-chatbox-button'); var $el = view.$el.find('.toggle-chatbox-button');
var $new_el = converse.templates.chatbox_minimize( var $new_el = converse.templates.chatbox_minimize(
_.extend({info_minimize: __('Minimize this chat box')}) {info_minimize: __('Minimize this chat box')}
); );
if ($el.length) { if ($el.length) {
$el.replaceWith($new_el); $el.replaceWith($new_el);
...@@ -506,7 +518,6 @@ ...@@ -506,7 +518,6 @@
} }
}; };
converse.on('chatBoxOpened', renderMinimizeButton); converse.on('chatBoxOpened', renderMinimizeButton);
converse.on('chatRoomOpened', renderMinimizeButton);
converse.on('controlBoxOpened', function (evt, chatbox) { converse.on('controlBoxOpened', function (evt, chatbox) {
// Wrapped in anon method because at scan time, chatboxviews // Wrapped in anon method because at scan time, chatboxviews
......
src/converse-muc.js
View file @ 910e9bdd
This diff is collapsed.
src/templates/chatroom.html
View file @ 910e9bdd
<div class="flyout box-flyout"> <div class="flyout box-flyout">
<div class="dragresize dragresize-top"></div> <div class="chat-head chat-head-chatroom"></div>
<div class="dragresize dragresize-topleft"></div>
<div class="dragresize dragresize-left"></div>
<div class="chat-head chat-head-chatroom">
<a class="chatbox-btn close-chatbox-button icon-close" title="{{info_close}}"></a>
<a class="chatbox-btn configure-chatroom-button icon-wrench" title="{{info_configure}} "style="display:none"></a>
<div class="chat-title">
{{ _.escape(name) }}
<p class="chatroom-topic"><p/>
</div>
</div>
<div class="chat-body chatroom-body"><span class="spinner centered"/></div> <div class="chat-body chatroom-body"><span class="spinner centered"/></div>
</div> </div>
src/templates/chatroom_bookmark_toggle.html 0 → 100644
View file @ 910e9bdd
<a class="chatbox-btn toggle-bookmark icon-pushpin
{[ if (bookmarked) {]}
button-on
{[ } ]}" title="{{info_toggle_bookmark}}"></a>
src/templates/chatroom_dragresize.html 0 → 100644
View file @ 910e9bdd
<div class="dragresize dragresize-top"></div>
<div class="dragresize dragresize-topleft"></div>
<div class="dragresize dragresize-left"></div>
src/templates/chatroom_head.html 0 → 100644
View file @ 910e9bdd
<a class="chatbox-btn close-chatbox-button icon-close" title="{{info_close}}"></a>
{[ if (affiliation == 'owner') { ]}
<a class="chatbox-btn configure-chatroom-button icon-wrench" title="{{info_configure}} "></a>
{[ } ]}
<div class="chat-title">
{{ _.escape(name) }}
<p class="chatroom-topic"><p/>
</div>
src/templates/dragresize.html 0 → 100644
View file @ 910e9bdd
<div class="dragresize dragresize-top"></div>
<div class="dragresize dragresize-topleft"></div>
<div class="dragresize dragresize-left"></div>
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7