mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 08:21:24 +02:00
Code Review Changes
This commit is contained in:
parent
d32fc6ab86
commit
553b7d1f38
1 changed files with 14 additions and 15 deletions
|
@ -55,18 +55,17 @@
|
||||||
var urlRegEx = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;,:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+,~%\/\.\w\-]*)?\??(?:[\-\+=&;,:%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g;
|
var urlRegEx = /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[\-;:&=\+\$,\w]+@)?[A-Za-z0-9\.\-]+|(?:www\.|[\-;,:&=\+\$,\w]+@)[A-Za-z0-9\.\-]+)((?:\/[\+,~%\/\.\w\-]*)?\??(?:[\-\+=&;,:%@\.\w]*)#?(?:[\.\!\/\\\w]*))?)/g;
|
||||||
|
|
||||||
function reverseMatches(msg) {
|
function reverseMatches(msg) {
|
||||||
var con = [];
|
var result = [];
|
||||||
var matches = msg.match(urlRegEx);
|
var matches = msg.match(urlRegEx);
|
||||||
if (matches === null) {
|
if (matches === null) {
|
||||||
matches = [];
|
matches = [];
|
||||||
}
|
}
|
||||||
for (var i = 0; i <= matches.length; i++) {
|
for (var i = 0; i <= matches.length; i++) {
|
||||||
var sp = msg.split(matches[i], 2);
|
var split = msg.split(matches[i], 2);
|
||||||
console.log(sp);
|
result.push(split[0]);
|
||||||
con.push(sp[0]);
|
msg = split[1];
|
||||||
msg = sp[1];
|
|
||||||
}
|
}
|
||||||
return con;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Start George Function
|
//Start George Function
|
||||||
|
@ -83,25 +82,25 @@
|
||||||
|
|
||||||
var match = content.match(urlRegEx);
|
var match = content.match(urlRegEx);
|
||||||
var matchLength = match === null ? 0 : match.length;
|
var matchLength = match === null ? 0 : match.length;
|
||||||
var cons = reverseMatches(content);
|
var messageParts = reverseMatches(content);
|
||||||
|
|
||||||
var con = [];
|
var messageFormatted = [];
|
||||||
var tent = [];
|
var urlLinkified = [];
|
||||||
var con_tent = [];
|
var completeMessage = [];
|
||||||
|
|
||||||
for (var i = 0; i < matchLength; i++) {
|
for (var i = 0; i < matchLength; i++) {
|
||||||
tent.push(_linkify(match[i], options));
|
urlLinkified.push(_linkify(match[i], options));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var i = 0; i < cons.length; i++) {
|
for (var i = 0; i < messageParts.length; i++) {
|
||||||
con.push(replaceFormatting(cons[i]));
|
messageFormatted.push(replaceFormatting(messageParts[i]));
|
||||||
}
|
}
|
||||||
|
|
||||||
for (var i = 0; i < con.length; i++) {
|
for (var i = 0; i < con.length; i++) {
|
||||||
con_tent.push(con[i], tent[i]);
|
completeMessage.push(messageFormatted[i], urlLinkified[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
$el.html(con_tent.join(""));
|
$el.html(completeMessage.join(""));
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue