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
21241c5c
Commit
21241c5c
authored
Dec 19, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #967. Rooms list not shown when server doesn't support bookmarks
parent
349d097e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
CHANGES.md
CHANGES.md
+1
-0
src/converse-bookmarks.js
src/converse-bookmarks.js
+5
-2
src/converse-roomslist.js
src/converse-roomslist.js
+1
-1
No files found.
CHANGES.md
View file @
21241c5c
...
...
@@ -6,6 +6,7 @@
-
#800 Could not register successfully in ejabberd 17.01
-
#949 Don't flash the roster contacts filter (i.e. hide by default)
-
#953 MUC "Features" displayed when exiting configuration
-
#967 Rooms list doesn't show when the server doesn't support bookmarks
-
Don't require
`auto_login`
to be
`true`
when using the API to log in.
-
Moment locale wasn't being set to the value passed via the
`i18n`
option.
-
In the chat heading, two avatars sometimes get rendered.
...
...
src/converse-bookmarks.js
View file @
21241c5c
...
...
@@ -385,7 +385,7 @@
_converse
.
log
(
'
Error while fetching bookmarks
'
,
Strophe
.
LogLevel
.
WARN
);
_converse
.
log
(
iq
.
outerHTML
,
Strophe
.
LogLevel
.
DEBUG
);
if
(
!
_
.
isNil
(
deferred
))
{
return
deferred
.
reject
();
return
deferred
.
reject
(
new
Error
(
"
Could not fetch bookmarks
"
)
);
}
}
});
...
...
@@ -517,10 +517,13 @@
return
;
}
_converse
.
bookmarks
=
new
_converse
.
Bookmarks
();
_converse
.
bookmarks
.
fetchBookmarks
().
then
(
function
()
{
_converse
.
bookmarks
.
fetchBookmarks
().
then
(
()
=>
{
_converse
.
bookmarksview
=
new
_converse
.
BookmarksView
(
{
'
model
'
:
_converse
.
bookmarks
}
);
})
.
catch
(
_
.
partial
(
_converse
.
log
,
_
,
Strophe
.
LogLevel
.
ERROR
))
.
then
(()
=>
{
_converse
.
emit
(
'
bookmarksInitialized
'
);
});
};
...
...
src/converse-roomslist.js
View file @
21241c5c
...
...
@@ -33,7 +33,7 @@
*
* NB: These plugins need to have already been loaded via require.js.
*/
optional_dependencies
:
[
"
converse-bookmarks
"
],
optional_dependencies
:
[
"
converse-
controlbox
"
,
"
converse-muc
"
,
"
converse-
bookmarks
"
],
initialize
()
{
/* The initialize function gets called as soon as the plugin is
...
...
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