bugfix: linkPreview - remove s flag from regexp because FF don't support it
This commit is contained in:
parent
d96ace0224
commit
f6691c138a
|
@ -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(/(.*)\[attachment(.*?)\](.*?)\[\/attachment\](.*)/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='(.*?)'/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="(.*?)"/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='(.*?)'/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="(.*?)"/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='(.*?)'/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="(.*?)"/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='(.*?)'/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="(.*?)"/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='(.*?)'/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="(.*?)"/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.*\[\/attachment]/im, '');
|
||||||
$('#' + selector).val(content);
|
$('#' + selector).val(content);
|
||||||
$('#' + selector).focus();
|
$('#' + selector).focus();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user