Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: url tags should not change to iurl #6901

Merged
merged 3 commits into from Aug 11, 2021
Merged

fix: url tags should not change to iurl #6901

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
362989c
fix: url tags should not change to iurl
live627 Aug 2, 2021
1502ef1
Always quote the url
live627 Aug 10, 2021
35b83e4
some more missing mailto link types
live627 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
120 changes: 61 additions & 59 deletions Themes/default/scripts/jquery.sceditor.smf.js
View file
Open in desktop
Expand Up @@ -209,25 +209,19 @@ sceditor.command.set(
var editor = this;

editor.commands.link._dropDown(editor, caller, function (url, text) {
// needed for IE to restore the last range
editor.focus();

// If there is no selected text then must set the URL as
// the text. Most browsers do this automatically, sadly
// IE doesn't.
if (!editor.getRangeHelper().selectedHtml() || text) {
text = text || url;

editor.wysiwygEditorInsertHtml(
'<a target="_blank" rel="noopener" href="' +
'<a data-type="url" href="' +
Sesquipedalian marked this conversation as resolved.
Show resolved Hide resolved
sceditor.escapeEntities(url) + '">' +
sceditor.escapeEntities(text, true) + '</a>'
);
} else {
// Can't just use `editor.execCommand('createlink', url)`
// because we need to set the target attribute.
// because we need to set a custom attribute.
editor.wysiwygEditorInsertHtml(
'<a target="_blank" rel="noopener" href="' +
'<a data-type="url" href="' +
Sesquipedalian marked this conversation as resolved.
Show resolved Hide resolved
sceditor.escapeEntities(url) + '">', '</a>'
);
}
Expand Down Expand Up @@ -325,18 +319,20 @@ sceditor.command.set(
caller,
function (email, text)
{
// needed for IE to reset the last range
editor.focus();

if (!editor.getRangeHelper().selectedHtml() || text)
editor.wysiwygEditorInsertHtml(
'<a href="' +
'<a data-type="email" href="' +
'mailto:' + sceditor.escapeEntities(email) + '">' +
sceditor.escapeEntities(text || email) +
'</a>'
);
else
editor.execCommand('createlink', 'mailto:' + email);
// Can't just use `editor.execCommand('createlink', email)`
// because we need to set a custom attribute.
editor.wysiwygEditorInsertHtml(
'<a data-type="email" href="mailto:' +
sceditor.escapeEntities(email) + '">', '</a>'
);
}
);
},
Expand Down Expand Up @@ -632,8 +628,11 @@ sceditor.formats.bbcode.set(
sceditor.formats.bbcode.set(
'attach', {
tags: {
attach: {
src: null
img: {
'data-attachment': null
},
a: {
'data-attachment': null
}
},
allowsEmpty: true,
Expand Down Expand Up @@ -734,63 +733,61 @@ sceditor.formats.bbcode.set(
);

sceditor.formats.bbcode.set(
'url', {
'email', {
allowsEmpty: true,
quoteType: $.sceditor.BBCodeParser.QuoteType.never,
quoteType: sceditor.BBCodeParser.QuoteType.never,
tags: {
a: {
href: null
'data-type': ['email']
}
},
format: function (element, content) {
var element = $(element),
url = element.attr('href');

// make sure this link is not an e-mail, if it is return e-mail BBCode
if (url.substr(0, 7) === 'mailto:')
return '[email=' + url.substr(7) + ']' + content + '[/email]';

if (typeof element.attr('target') !== "undefined")
return '[url=\"' + decodeURI(url) + '\"]' + content + '[/url]';

// A mention?
else if (typeof element.attr('data-mention') !== "undefined")
return '[member='+ element.attr('data-mention') +']'+ content.replace('@','') +'[/member]';

// Is this an attachment?
else if (typeof element.attr('data-attachment') !== "undefined")
{
var attribs = ' id=' + element.attr('data-attachment');
if (typeof element.attr('alt') !== "undefined")
attribs += ' alt=' + element.attr('alt');
if (typeof element.attr('data-type') !== "undefined")
attribs += ' type=' + element.attr("data-type");
format: function (element, content)
{
return '[email=' + element.href.substr(7) + ']' + content + '[/email]';
},
html: function (token, attrs, content)
{
return '<a data-type="email" href="mailto:' + sceditor.escapeEntities(attrs.defaultattr || content, true) + '">' + content + '</a>';
}
}
);

return '[attach' + attribs + ']' + content + '[/attach]';
sceditor.formats.bbcode.set(
'url', {
allowsEmpty: true,
quoteType: sceditor.BBCodeParser.QuoteType.always,
tags: {
a: {
'data-type': ['url']
}

else
return '[iurl=\"' + decodeURI(url) + '\"]' + content + '[/iurl]';
},
html: function (token, attrs, content) {
if (typeof attrs.defaultattr === "undefined" || attrs.defaultattr.length === 0)
attrs.defaultattr = content;

return '<a target="_blank" rel="noopener" href="' + encodeURI(attrs.defaultattr) + '">' + content + '</a>';
format: function (element, content)
{
return '[url=' + decodeURI(element.href) + ']' + content + '[/url]';
Sesquipedalian marked this conversation as resolved.
Show resolved Hide resolved
},
html: function (token, attrs, content)
{
return '<a data-type="url" href="' + encodeURI(attrs.defaultattr || content) + '">' + content + '</a>';
}
}
);

sceditor.formats.bbcode.set(
'iurl', {
allowsEmpty: true,
quoteType: $.sceditor.BBCodeParser.QuoteType.never,
html: function (token, attrs, content) {

if (typeof attrs.defaultattr === "undefined" || attrs.defaultattr.length === 0)
attrs.defaultattr = content;

return '<a href="' + encodeURI(attrs.defaultattr) + '">' + content + '</a>';
quoteType: sceditor.BBCodeParser.QuoteType.always,
tags: {
a: {
'data-type': ['iurl']
}
},
format: function (element, content)
{
return '[iurl=' + decodeURI(element.href) + ']' + content + '[/iurl]';
Sesquipedalian marked this conversation as resolved.
Show resolved Hide resolved
},
html: function (token, attrs, content)
{
return '<a data-type="iurl" href="' + encodeURI(attrs.defaultattr || content) + '">' + content + '</a>';
}
}
);
Expand Down Expand Up @@ -919,12 +916,17 @@ sceditor.formats.bbcode.set(

return '[font=' + font + ']' + content + '[/font]';
}
}
}
);

sceditor.formats.bbcode.set(
'member', {
isInline: true,
tags: {
a: {
'data-mention': null
}
},
format: function (element, content) {
return '[member='+ $(element).attr('data-mention') +']'+ content.replace('@','') +'[/member]';
},
Expand Down