bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #6650 from rabuzarus/20190213_-_fix_frio_linkpreview_for_display_module

Browse source 
bugfix: linkPreview - remove s flag from regexp because FF don't support it
This commit is contained in:
Hypolite Petovan 2019-02-13 16:38:27 -05:00 committed by GitHub
parent a29b6f17e2 b7573a94ee
commit 3968005e22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
view/js/linkPreview.js
View file

@ -512,7 +512,7 @@
var getAttachmentData = function(content) { var getAttachmentData = function(content) {
var data = {}; var data = {};
var match = content.match(/(.*)\[attachment(.*?)\](.*?)\[\/attachment\](.*)/ism); var match = content.match(/([\s\S]*)\[attachment([\s\S]*?)\]([\s\S]*?)\[\/attachment\]([\s\S]*)/im);
if (match === null || match.length < 5) { if (match === null || match.length < 5) {
return null; return null;
} }
@ -521,12 +521,12 @@
data.text = trim(match[1]); data.text = trim(match[1]);
var type = ''; var type = '';
var matches = attributes.match(/type='(.*?)'/ism); var matches = attributes.match(/type='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
type = matches[1].toLowerCase(); type = matches[1].toLowerCase();
} }
matches = attributes.match(/type="(.*?)"/ism); matches = attributes.match(/type="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
type = matches[1].toLowerCase(); type = matches[1].toLowerCase();
} }
@ -550,12 +550,12 @@
var url = ''; var url = '';
matches = attributes.match(/url='(.*?)'/ism); matches = attributes.match(/url='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
url = matches[1].toLowerCase(); url = matches[1].toLowerCase();
} }
matches = attributes.match(/url="(.*?)"/ism); matches = attributes.match(/url="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
url = matches[1].toLowerCase(); url = matches[1].toLowerCase();
} }
@ -566,12 +566,12 @@
var title = ''; var title = '';
matches = attributes.match(/title='(.*?)'/ism); matches = attributes.match(/title='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
title = matches[1].toLowerCase(); title = matches[1].toLowerCase();
} }
matches = attributes.match(/title="(.*?)"/ism); matches = attributes.match(/title="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
title = matches[1].toLowerCase(); title = matches[1].toLowerCase();
} }
@ -582,12 +582,12 @@
var image = ''; var image = '';
matches = attributes.match(/image='(.*?)'/ism); matches = attributes.match(/image='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
image = matches[1].toLowerCase(); image = matches[1].toLowerCase();
} }
matches = attributes.match(/image="(.*?)"/ism); matches = attributes.match(/image="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
image = matches[1].toLowerCase(); image = matches[1].toLowerCase();
} }
@ -598,12 +598,12 @@
var preview = ''; var preview = '';
matches = attributes.match(/preview='(.*?)'/ism); matches = attributes.match(/preview='([\s\S]*?)'/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
preview = matches[1].toLowerCase(); preview = matches[1].toLowerCase();
} }
matches = attributes.match(/preview="(.*?)"/ism); matches = attributes.match(/preview="([\s\S]*?)"/im);
if (matches !== null && typeof matches[1] !== 'undefined') { if (matches !== null && typeof matches[1] !== 'undefined') {
preview = matches[1].toLowerCase(); preview = matches[1].toLowerCase();
} }
@ -630,7 +630,7 @@
if (attachmentData) { if (attachmentData) {
reAddAttachment(attachmentData); reAddAttachment(attachmentData);
// Remove the attachment bbcode from the textarea. // Remove the attachment bbcode from the textarea.
var content = content.replace(/\[attachment.*\[\/attachment]/ism, ''); var content = content.replace(/\[attachment[\s\S]*\[\/attachment]/im, '');
$('#' + selector).val(content); $('#' + selector).val(content);
$('#' + selector).focus(); $('#' + selector).focus();
} }