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
4c83a233
Commit
4c83a233
authored
Feb 13, 2019
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Reject the `waitUntilFeaturesDiscovered` promise if query failed"
This reverts commit
01f0a652
. Updates #1410
parent
3fe6efc2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
CHANGES.md
CHANGES.md
+5
-4
dist/converse.js
dist/converse.js
+1
-1
src/headless/converse-disco.js
src/headless/converse-disco.js
+2
-2
No files found.
CHANGES.md
View file @
4c83a233
...
...
@@ -8,12 +8,13 @@
-
Set releases URL to new Github repo
-
#1369 Don't wrongly interpret message with
`subject`
as a topic change.
-
#1405 Status of contacts list are not displayed properly
-
#1408 new config option
`roomconfig_whitelist`
-
#1412 muc moderator commands can be disabled selectively by config
-
#1413 fix moderator commands that change affiliation
-
#1408 New config option
`roomconfig_whitelist`
-
#1410 HTTP upload not working if conversations push proxy is used
-
#1412 MUC moderator commands can be disabled selectively by config
-
#1413 Fix moderator commands that change affiliation
-
#1414 Prevent duplicate messages on MUC join
-
#1417 Margin between nickname and badge
-
#1421
f
ix direct invite for membersonly room
-
#1421
F
ix direct invite for membersonly room
-
#1422 Resurrect the
`muc_show_join_leave`
option
-
#1442 MUC read receipts causing empty lines
...
...
dist/converse.js
View file @
4c83a233
...
...
@@ -64551,7 +64551,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-dis
const stanza = await _converse.api.disco.info(this.get('jid'), null);
this.onInfo(stanza);
} catch (iq) {
this.waitUntilFeaturesDiscovered.re
ject(iq
);
this.waitUntilFeaturesDiscovered.re
solve(this
);
_converse.log(iq, Strophe.LogLevel.ERROR);
}
src/headless/converse-disco.js
View file @
4c83a233
...
...
@@ -130,8 +130,8 @@ converse.plugins.add('converse-disco', {
try
{
const
stanza
=
await
_converse
.
api
.
disco
.
info
(
this
.
get
(
'
jid
'
),
null
);
this
.
onInfo
(
stanza
);
}
catch
(
iq
)
{
this
.
waitUntilFeaturesDiscovered
.
re
ject
(
iq
);
}
catch
(
iq
)
{
this
.
waitUntilFeaturesDiscovered
.
re
solve
(
this
);
_converse
.
log
(
iq
,
Strophe
.
LogLevel
.
ERROR
);
}
},
...
...
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