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
75301d28
Commit
75301d28
authored
Aug 21, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix. `info called on object that doesn't implement interface Console`
parent
016bca74
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
src/converse-core.js
src/converse-core.js
+6
-6
src/utils.js
src/utils.js
+5
-5
No files found.
src/converse-core.js
View file @
75301d28
...
@@ -120,11 +120,11 @@
...
@@ -120,11 +120,11 @@
if
(
message
instanceof
Error
)
{
if
(
message
instanceof
Error
)
{
message
=
message
.
stack
;
message
=
message
.
stack
;
}
}
const
logger
=
_
.
assign
In
({
const
logger
=
_
.
assign
({
'
debug
'
:
console
.
log
||
_
.
noop
,
'
debug
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
error
'
:
console
.
log
||
_
.
noop
,
'
error
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
info
'
:
console
.
log
||
_
.
noop
,
'
info
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
warn
'
:
console
.
log
||
_
.
noop
,
'
warn
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
},
console
);
},
console
);
if
(
level
===
Strophe
.
LogLevel
.
ERROR
)
{
if
(
level
===
Strophe
.
LogLevel
.
ERROR
)
{
if
(
_converse
.
debug
)
{
if
(
_converse
.
debug
)
{
...
@@ -1658,7 +1658,7 @@
...
@@ -1658,7 +1658,7 @@
this
.
connection
.
restore
(
this
.
jid
,
this
.
onConnectStatusChanged
);
this
.
connection
.
restore
(
this
.
jid
,
this
.
onConnectStatusChanged
);
return
true
;
return
true
;
}
catch
(
e
)
{
}
catch
(
e
)
{
this
.
log
(
_converse
.
log
(
"
Could not restore session for jid:
"
+
"
Could not restore session for jid:
"
+
this
.
jid
+
"
Error message:
"
+
e
.
message
);
this
.
jid
+
"
Error message:
"
+
e
.
message
);
this
.
clearSession
();
// If there's a roster, we want to clear it (see #555)
this
.
clearSession
();
// If there's a roster, we want to clear it (see #555)
...
...
src/utils.js
View file @
75301d28
...
@@ -33,11 +33,11 @@
...
@@ -33,11 +33,11 @@
const
URL_REGEX
=
/
\b(
https
?
:
\/\/
|www
\.
|https
?
:
\/\/
www
\.)[^\s
<>
]{2,200}\b
/g
;
const
URL_REGEX
=
/
\b(
https
?
:
\/\/
|www
\.
|https
?
:
\/\/
www
\.)[^\s
<>
]{2,200}\b
/g
;
const
logger
=
_
.
assign
In
({
const
logger
=
_
.
assign
({
'
debug
'
:
console
.
log
||
_
.
noop
,
'
debug
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
error
'
:
console
.
log
||
_
.
noop
,
'
error
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
info
'
:
console
.
log
||
_
.
noop
,
'
info
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
,
'
warn
'
:
console
.
log
||
_
.
noop
,
'
warn
'
:
_
.
get
(
console
,
'
log
'
)
?
console
.
log
.
bind
(
console
)
:
_
.
noop
},
console
);
},
console
);
var
afterAnimationEnd
=
function
(
el
,
callback
)
{
var
afterAnimationEnd
=
function
(
el
,
callback
)
{
...
...
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