Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:18:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Code Review Changes

Browse source
This commit is contained in:
Fluffy Jenkins 2020-01-21 22:54:35 +00:00
parent d32fc6ab86
commit 553b7d1f38
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
scripts/communityModules/chat/FloofChat.html
View file

@ -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(""));
}); });
}; };