Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
web-apps
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
Boris Kocherov
web-apps
Commits
d032cbdd
Commit
d032cbdd
authored
Jul 25, 2016
by
Julia Radzhabova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix bug 32494.
parent
045baf43
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
apps/common/main/lib/util/utils.js
apps/common/main/lib/util/utils.js
+1
-1
apps/common/main/lib/view/Chat.js
apps/common/main/lib/view/Chat.js
+2
-1
apps/common/main/lib/view/Comments.js
apps/common/main/lib/view/Comments.js
+2
-1
No files found.
apps/common/main/lib/util/utils.js
View file @
d032cbdd
...
...
@@ -88,7 +88,7 @@ Common.Utils = _.extend(new(function() {
ipRe
=
/^
(((
https
?)
|
(
ftps
?))
:
\/\/)?([\-\w
а-яё
]
*:
?[\-\w
а-яё
]
*@
)?(((
1
[
0-9
]{2}
|2
[
0-4
][
0-9
]
|25
[
0-5
]
|
[
1-9
][
0-9
]
|
[
0-9
])\.){3}(
1
[
0-9
]{2}
|2
[
0-4
][
0-9
]
|25
[
0-5
]
|
[
1-9
][
0-9
]
|
[
0-9
]))(
:
\d
+
)?(\/[
%
\-\w
а-яё
]
*
(\.[\w
а-яё
]{2,})?(([\w
а-яё
\-\.\?\\\/
+@&#;:`~=%!,
\(\)]
*
)(\.[\w
а-яё
]{2,})?)
*
)
*
\/?
/i
,
hostnameRe
=
/^
(((
https
?)
|
(
ftps
?))
:
\/\/)?([\-\w
а-яё
]
*:
?[\-\w
а-яё
]
*@
)?(([\-\w
а-яё
]
+
\.)
+
[\w
а-яё
\-]{2,}(
:
\d
+
)?(\/[
%
\-\w
а-яё
]
*
(\.[\w
а-яё
]{2,})?(([\w
а-яё
\-\.\?\\\/
+@&#;:`~=%!,
\(\)]
*
)(\.[\w
а-яё
]{2,})?)
*
)
*
\/?)
/i
,
localRe
=
/^
(((
https
?)
|
(
ftps
?))
:
\/\/)([\-\w
а-яё
]
*:
?[\-\w
а-яё
]
*@
)?(([\-\w
а-яё
]
+
)(
:
\d
+
)?(\/[
%
\-\w
а-яё
]
*
(\.[\w
а-яё
]{2,})?(([\w
а-яё
\-\.\?\\\/
+@&#;:`~=%!,
\(\)]
*
)(\.[\w
а-яё
]{2,})?)
*
)
*
\/?)
/i
,
emailStrongRe
=
/
(
mailto:
)
([
a-z0-9'
\.
_-
]
+@
[
a-z0-9
\.
-
]
+
\.[
a-z0-9
]{2,4})([
a-яё0-9
\.
_%+-=
\?
:&
]
*
)
/ig
,
emailStrongRe
=
/
(
mailto:
)
?([
a-z0-9'
\.
_-
]
+@
[
a-z0-9
\.
-
]
+
\.[
a-z0-9
]{2,4})([
a-яё0-9
\.
_%+-=
\?
:&
]
*
)
/ig
,
ipStrongRe
=
/
(((
https
?)
|
(
ftps
?))
:
\/\/([\-\w
а-яё
]
*:
?[\-\w
а-яё
]
*@
)?)(((
1
[
0-9
]{2}
|2
[
0-4
][
0-9
]
|25
[
0-5
]
|
[
1-9
][
0-9
]
|
[
0-9
])\.){3}(
1
[
0-9
]{2}
|2
[
0-4
][
0-9
]
|25
[
0-5
]
|
[
1-9
][
0-9
]
|
[
0-9
]))(
:
\d
+
)?(\/[
%
\-\w
а-яё
]
*
(\.[\w
а-яё
]{2,})?(([\w
а-яё
\-\.\?\\\/
+@&#;:`~=%!,
\(\)]
*
)(\.[\w
а-яё
]{2,})?)
*
)
*
\/?
/ig
,
hostnameStrongRe
=
/
((((
https
?)
|
(
ftps
?))
:
\/\/([\-\w
а-яё
]
*:
?[\-\w
а-яё
]
*@
)?)
|
(([\-\w
а-яё
]
*:
?[\-\w
а-яё
]
*@
)?
www
\.))((([\-\w
а-яё
]
+
\.)
+
[\w
а-яё
\-]{2,}
|
([\-\w
а-яё
]
+
))(
:
\d
+
)?(\/[
%
\-\w
а-яё
]
*
(\.[\w
а-яё
]{2,})?(([\w
а-яё
\-\.\?\\\/
+@&#;:`~=%!,
\(\)]
*
)(\.[\w
а-яё
]{2,})?)
*
)
*
\/?)
/ig
,
documentSettingsType
=
{
...
...
apps/common/main/lib/view/Chat.js
View file @
d032cbdd
...
...
@@ -228,8 +228,9 @@ define([
var
arr
=
[],
offset
,
len
;
message
.
replace
(
Common
.
Utils
.
emailStrongRe
,
function
(
subStr
)
{
var
ref
=
(
!
/
((
^mailto:
)\/\/)
/i
.
test
(
subStr
)
)
?
(
'
mailto:
'
+
subStr
)
:
subStr
;
offset
=
arguments
[
arguments
.
length
-
2
];
arr
.
push
({
start
:
offset
,
end
:
subStr
.
length
+
offset
,
str
:
'
<a href="
'
+
subStr
+
'
">
'
+
subStr
+
'
</a>
'
});
arr
.
push
({
start
:
offset
,
end
:
subStr
.
length
+
offset
,
str
:
'
<a href="
'
+
ref
+
'
">
'
+
subStr
+
'
</a>
'
});
return
''
;
});
...
...
apps/common/main/lib/view/Comments.js
View file @
d032cbdd
...
...
@@ -1357,8 +1357,9 @@ define([
message
=
Common
.
Utils
.
String
.
htmlEncode
(
message
);
message
.
replace
(
Common
.
Utils
.
emailStrongRe
,
function
(
subStr
)
{
var
ref
=
(
!
/
((
^mailto:
)\/\/)
/i
.
test
(
subStr
)
)
?
(
'
mailto:
'
+
subStr
)
:
subStr
;
offset
=
arguments
[
arguments
.
length
-
2
];
arr
.
push
({
start
:
offset
,
end
:
subStr
.
length
+
offset
,
str
:
'
<a href="
'
+
subStr
+
'
">
'
+
subStr
+
'
</a>
'
});
arr
.
push
({
start
:
offset
,
end
:
subStr
.
length
+
offset
,
str
:
'
<a href="
'
+
ref
+
'
">
'
+
subStr
+
'
</a>
'
});
return
''
;
});
...
...
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