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
36e56052
Commit
36e56052
authored
Dec 30, 2019
by
Christoph Scholz
Committed by
JC Brand
Jan 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't log error if user has no bookmarks
parent
916e300a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
CHANGES.md
CHANGES.md
+1
-0
src/headless/converse-bookmarks.js
src/headless/converse-bookmarks.js
+6
-5
No files found.
CHANGES.md
View file @
36e56052
...
...
@@ -2,6 +2,7 @@
-
#1313: Stylistic improvements to the send button
-
#1793: Send button doesn't appear in Firefox in 1:1 chats
-
#1822: Don't log error if user has no bookmarks
## 6.0.0 (2020-01-09)
...
...
src/headless/converse-bookmarks.js
View file @
36e56052
...
...
@@ -237,18 +237,19 @@ converse.plugins.add('converse-bookmarks', {
[
__
(
"
The server did not return your bookmarks within the allowed time.
"
+
"
You can reload the page to request them again.
"
)]
);
}
else
{
log
.
error
(
'
Error while fetching bookmarks
'
);
log
.
error
(
iq
);
}
if
(
deferred
)
{
}
else
if
(
deferred
)
{
if
(
iq
.
querySelector
(
'
error[type="cancel"] item-not-found
'
))
{
// Not an exception, the user simply doesn't have any bookmarks.
window
.
sessionStorage
.
setItem
(
this
.
fetched_flag
,
true
);
return
deferred
.
resolve
();
}
else
{
log
.
error
(
'
Error while fetching bookmarks
'
);
log
.
error
(
iq
);
return
deferred
.
reject
(
new
Error
(
"
Could not fetch bookmarks
"
));
}
}
else
{
log
.
error
(
'
Error while fetching bookmarks
'
);
log
.
error
(
iq
);
}
},
...
...
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