Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
1898e786
Commit
1898e786
authored
Jul 28, 2020
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move the MUC list modal to its own file
parent
16ca8044
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
205 additions
and
194 deletions
+205
-194
karma.conf.js
karma.conf.js
+1
-1
spec/muc.js
spec/muc.js
+3
-4
spec/muclist.js
spec/muclist.js
+1
-1
src/converse-muc-views.js
src/converse-muc-views.js
+8
-188
src/modals/muc-list.js
src/modals/muc-list.js
+192
-0
No files found.
karma.conf.js
View file @
1898e786
...
...
@@ -26,7 +26,7 @@ module.exports = function(config) {
{
pattern
:
"
spec/spoilers.js
"
,
type
:
'
module
'
},
{
pattern
:
"
spec/emojis.js
"
,
type
:
'
module
'
},
{
pattern
:
"
spec/
rooms
list.js
"
,
type
:
'
module
'
},
{
pattern
:
"
spec/
muc
list.js
"
,
type
:
'
module
'
},
{
pattern
:
"
spec/utils.js
"
,
type
:
'
module
'
},
{
pattern
:
"
spec/converse.js
"
,
type
:
'
module
'
},
{
pattern
:
"
spec/bookmarks.js
"
,
type
:
'
module
'
},
...
...
spec/muc.js
View file @
1898e786
...
...
@@ -12,7 +12,6 @@ const u = converse.env.utils;
describe
(
"
Groupchats
"
,
function
()
{
describe
(
"
The
\"
rooms
\"
API
"
,
function
()
{
it
(
"
has a method 'close' which closes rooms by JID or all rooms when called with no arguments
"
,
...
...
@@ -4862,7 +4861,7 @@ describe("Groupchats", function () {
const
roomspanel
=
_converse
.
chatboxviews
.
get
(
'
controlbox
'
).
roomspanel
;
roomspanel
.
el
.
querySelector
(
'
.show-list-muc-modal
'
).
click
();
mock
.
closeControlBox
(
_converse
);
const
modal
=
roomspanel
.
list_rooms
_modal
;
const
modal
=
roomspanel
.
muc_list
_modal
;
await
u
.
waitUntil
(()
=>
u
.
isVisible
(
modal
.
el
),
1000
);
spyOn
(
_converse
.
ChatRoom
.
prototype
,
'
getDiscoInfo
'
).
and
.
callFake
(()
=>
Promise
.
resolve
());
roomspanel
.
delegateEvents
();
// We need to rebind all events otherwise our spy won't be called
...
...
@@ -4939,7 +4938,7 @@ describe("Groupchats", function () {
const
roomspanel
=
_converse
.
chatboxviews
.
get
(
'
controlbox
'
).
roomspanel
;
roomspanel
.
el
.
querySelector
(
'
.show-list-muc-modal
'
).
click
();
mock
.
closeControlBox
(
_converse
);
const
modal
=
roomspanel
.
list_rooms
_modal
;
const
modal
=
roomspanel
.
muc_list
_modal
;
await
u
.
waitUntil
(()
=>
u
.
isVisible
(
modal
.
el
),
1000
);
const
server_input
=
modal
.
el
.
querySelector
(
'
input[name="server"]
'
);
expect
(
server_input
.
value
).
toBe
(
'
muc.example.org
'
);
...
...
@@ -4956,7 +4955,7 @@ describe("Groupchats", function () {
const
roomspanel
=
_converse
.
chatboxviews
.
get
(
'
controlbox
'
).
roomspanel
;
roomspanel
.
el
.
querySelector
(
'
.show-list-muc-modal
'
).
click
();
mock
.
closeControlBox
(
_converse
);
const
modal
=
roomspanel
.
list_rooms
_modal
;
const
modal
=
roomspanel
.
muc_list
_modal
;
await
u
.
waitUntil
(()
=>
u
.
isVisible
(
modal
.
el
),
1000
);
spyOn
(
_converse
.
ChatRoom
.
prototype
,
'
getDiscoInfo
'
).
and
.
callFake
(()
=>
Promise
.
resolve
());
roomspanel
.
delegateEvents
();
// We need to rebind all events otherwise our spy won't be called
...
...
spec/
rooms
list.js
→
spec/
muc
list.js
View file @
1898e786
/* global mock */
/* global mock
, converse
*/
describe
(
"
A list of open groupchats
"
,
function
()
{
...
...
src/converse-muc-views.js
View file @
1898e786
This diff is collapsed.
Click to expand it.
src/modals/muc-list.js
0 → 100644
View file @
1898e786
import
log
from
"
@converse/headless/log
"
;
import
sizzle
from
'
sizzle
'
;
import
st
from
"
@converse/headless/utils/stanza
"
;
import
tpl_list_chatrooms_modal
from
"
templates/list_chatrooms_modal.js
"
;
import
tpl_room_description
from
"
templates/room_description.html
"
;
import
tpl_spinner
from
"
templates/spinner.html
"
;
import
{
BootstrapModal
}
from
"
../converse-modal.js
"
;
import
{
Strophe
,
$iq
}
from
'
strophe.js/src/strophe
'
;
import
{
__
}
from
'
@converse/headless/i18n
'
;
import
{
_converse
,
api
,
converse
}
from
"
@converse/headless/converse-core
"
;
import
{
head
}
from
"
lodash-es
"
;
const
u
=
converse
.
env
.
utils
;
/* Insert groupchat info (based on returned #disco IQ stanza)
* @function insertRoomInfo
* @param { HTMLElement } el - The HTML DOM element that contains the info.
* @param { XMLElement } stanza - The IQ stanza containing the groupchat info.
*/
function
insertRoomInfo
(
el
,
stanza
)
{
// All MUC features found here: https://xmpp.org/registrar/disco-features.html
el
.
querySelector
(
'
span.spinner
'
).
remove
();
el
.
querySelector
(
'
a.room-info
'
).
classList
.
add
(
'
selected
'
);
el
.
insertAdjacentHTML
(
'
beforeEnd
'
,
tpl_room_description
({
'
jid
'
:
stanza
.
getAttribute
(
'
from
'
),
'
desc
'
:
head
(
sizzle
(
'
field[var="muc#roominfo_description"] value
'
,
stanza
))?.
textContent
,
'
occ
'
:
head
(
sizzle
(
'
field[var="muc#roominfo_occupants"] value
'
,
stanza
))?.
textContent
,
'
hidden
'
:
sizzle
(
'
feature[var="muc_hidden"]
'
,
stanza
).
length
,
'
membersonly
'
:
sizzle
(
'
feature[var="muc_membersonly"]
'
,
stanza
).
length
,
'
moderated
'
:
sizzle
(
'
feature[var="muc_moderated"]
'
,
stanza
).
length
,
'
nonanonymous
'
:
sizzle
(
'
feature[var="muc_nonanonymous"]
'
,
stanza
).
length
,
'
open
'
:
sizzle
(
'
feature[var="muc_open"]
'
,
stanza
).
length
,
'
passwordprotected
'
:
sizzle
(
'
feature[var="muc_passwordprotected"]
'
,
stanza
).
length
,
'
persistent
'
:
sizzle
(
'
feature[var="muc_persistent"]
'
,
stanza
).
length
,
'
publicroom
'
:
sizzle
(
'
feature[var="muc_publicroom"]
'
,
stanza
).
length
,
'
semianonymous
'
:
sizzle
(
'
feature[var="muc_semianonymous"]
'
,
stanza
).
length
,
'
temporary
'
:
sizzle
(
'
feature[var="muc_temporary"]
'
,
stanza
).
length
,
'
unmoderated
'
:
sizzle
(
'
feature[var="muc_unmoderated"]
'
,
stanza
).
length
,
'
label_desc
'
:
__
(
'
Description:
'
),
'
label_jid
'
:
__
(
'
Groupchat Address (JID):
'
),
'
label_occ
'
:
__
(
'
Participants:
'
),
'
label_features
'
:
__
(
'
Features:
'
),
'
label_requires_auth
'
:
__
(
'
Requires authentication
'
),
'
label_hidden
'
:
__
(
'
Hidden
'
),
'
label_requires_invite
'
:
__
(
'
Requires an invitation
'
),
'
label_moderated
'
:
__
(
'
Moderated
'
),
'
label_non_anon
'
:
__
(
'
Non-anonymous
'
),
'
label_open_room
'
:
__
(
'
Open
'
),
'
label_permanent_room
'
:
__
(
'
Permanent
'
),
'
label_public
'
:
__
(
'
Public
'
),
'
label_semi_anon
'
:
__
(
'
Semi-anonymous
'
),
'
label_temp_room
'
:
__
(
'
Temporary
'
),
'
label_unmoderated
'
:
__
(
'
Unmoderated
'
)
}));
}
/**
* Show/hide extra information about a groupchat in a listing.
* @function toggleRoomInfo
* @param { Event }
*/
function
toggleRoomInfo
(
ev
)
{
const
parent_el
=
u
.
ancestor
(
ev
.
target
,
'
.room-item
'
);
const
div_el
=
parent_el
.
querySelector
(
'
div.room-info
'
);
if
(
div_el
)
{
u
.
slideIn
(
div_el
).
then
(
u
.
removeElement
)
parent_el
.
querySelector
(
'
a.room-info
'
).
classList
.
remove
(
'
selected
'
);
}
else
{
parent_el
.
insertAdjacentHTML
(
'
beforeend
'
,
tpl_spinner
());
api
.
disco
.
info
(
ev
.
target
.
getAttribute
(
'
data-room-jid
'
),
null
)
.
then
(
stanza
=>
insertRoomInfo
(
parent_el
,
stanza
))
.
catch
(
e
=>
log
.
error
(
e
));
}
}
export
default
BootstrapModal
.
extend
({
id
:
"
list-chatrooms-modal
"
,
initialize
()
{
this
.
items
=
[];
this
.
loading_items
=
false
;
BootstrapModal
.
prototype
.
initialize
.
apply
(
this
,
arguments
);
if
(
api
.
settings
.
get
(
'
muc_domain
'
)
&&
!
this
.
model
.
get
(
'
muc_domain
'
))
{
this
.
model
.
save
(
'
muc_domain
'
,
api
.
settings
.
get
(
'
muc_domain
'
));
}
this
.
listenTo
(
this
.
model
,
'
change:muc_domain
'
,
this
.
onDomainChange
);
},
toHTML
()
{
const
muc_domain
=
this
.
model
.
get
(
'
muc_domain
'
)
||
api
.
settings
.
get
(
'
muc_domain
'
);
return
tpl_list_chatrooms_modal
(
Object
.
assign
(
this
.
model
.
toJSON
(),
{
'
show_form
'
:
!
api
.
settings
.
get
(
'
locked_muc_domain
'
),
'
server_placeholder
'
:
muc_domain
?
muc_domain
:
__
(
'
conference.example.org
'
),
'
items
'
:
this
.
items
,
'
loading_items
'
:
this
.
loading_items
,
'
openRoom
'
:
ev
=>
this
.
openRoom
(
ev
),
'
setDomainFromEvent
'
:
ev
=>
this
.
setDomainFromEvent
(
ev
),
'
submitForm
'
:
ev
=>
this
.
showRooms
(
ev
),
'
toggleRoomInfo
'
:
ev
=>
this
.
toggleRoomInfo
(
ev
)
}));
},
afterRender
()
{
if
(
api
.
settings
.
get
(
'
locked_muc_domain
'
))
{
this
.
updateRoomsList
();
}
else
{
this
.
el
.
addEventListener
(
'
shown.bs.modal
'
,
()
=>
this
.
el
.
querySelector
(
'
input[name="server"]
'
).
focus
(),
false
);
}
},
openRoom
(
ev
)
{
ev
.
preventDefault
();
const
jid
=
ev
.
target
.
getAttribute
(
'
data-room-jid
'
);
const
name
=
ev
.
target
.
getAttribute
(
'
data-room-name
'
);
this
.
modal
.
hide
();
api
.
rooms
.
open
(
jid
,
{
'
name
'
:
name
},
true
);
},
toggleRoomInfo
(
ev
)
{
ev
.
preventDefault
();
toggleRoomInfo
(
ev
);
},
onDomainChange
()
{
api
.
settings
.
get
(
'
auto_list_rooms
'
)
&&
this
.
updateRoomsList
();
},
/**
* Handle the IQ stanza returned from the server, containing
* all its public groupchats.
* @private
* @method _converse.ChatRoomView#onRoomsFound
* @param { HTMLElement } iq
*/
onRoomsFound
(
iq
)
{
this
.
loading_items
=
false
;
const
rooms
=
iq
?
sizzle
(
'
query item
'
,
iq
)
:
[];
if
(
rooms
.
length
)
{
this
.
model
.
set
({
'
feedback_text
'
:
__
(
'
Groupchats found
'
)},
{
'
silent
'
:
true
});
this
.
items
=
rooms
.
map
(
st
.
getAttributes
);
}
else
{
this
.
items
=
[];
this
.
model
.
set
({
'
feedback_text
'
:
__
(
'
No groupchats found
'
)},
{
'
silent
'
:
true
});
}
this
.
render
();
return
true
;
},
/**
* Send an IQ stanza to the server asking for all groupchats
* @private
* @method _converse.ChatRoomView#updateRoomsList
*/
updateRoomsList
()
{
const
iq
=
$iq
({
'
to
'
:
this
.
model
.
get
(
'
muc_domain
'
),
'
from
'
:
_converse
.
connection
.
jid
,
'
type
'
:
"
get
"
}).
c
(
"
query
"
,
{
xmlns
:
Strophe
.
NS
.
DISCO_ITEMS
});
api
.
sendIQ
(
iq
)
.
then
(
iq
=>
this
.
onRoomsFound
(
iq
))
.
catch
(()
=>
this
.
onRoomsFound
())
},
showRooms
(
ev
)
{
ev
.
preventDefault
();
this
.
loading_items
=
true
;
this
.
render
();
const
data
=
new
FormData
(
ev
.
target
);
this
.
model
.
setDomain
(
data
.
get
(
'
server
'
));
this
.
updateRoomsList
();
},
setDomainFromEvent
(
ev
)
{
this
.
model
.
setDomain
(
ev
.
target
.
value
);
},
setNick
(
ev
)
{
this
.
model
.
save
({
nick
:
ev
.
target
.
value
});
}
});
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment