Skip to content

Add optional arguments #2

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

Open
tilghman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add optional arguments #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions placeholder/plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ tinymce.PluginManager.add('placeholder', function(editor, url) {
var i,re;
for(i=tokens.length-1; i>=0; i--) {
//to prevent the text equal to a token to be treated as a token
re = new RegExp('\\[\\!'+tokens[i].escapedToken+'\\](?![^\\<\\>]*\>)', 'gi');
re = new RegExp('\\[\\!'+tokens[i].escapedToken+'[^\\]]*\\](?![^\\<\\>]*\>)', 'gi');
s = s.replace(re, '[&#x21;'+tokens[i].token+']');

//substitutes the placeholders with the tokens
re = new RegExp('\<img[^\\>]+placeholder_data\\=\\"'+tokens[i].escapedToken+'\\"[^\\>]*\>', 'gi');
s = s.replace(re, '[!'+tokens[i].token+']');
re = new RegExp('\<img[^\\>]+placeholder_data\\=\\"'+tokens[i].escapedToken+'\\" placeholder_args\\=\\"([^\\"]*)[^\\>]*\>', 'gi');
s = s.replace(re, '[!'+tokens[i].token+"$1"+']');
}
return s;
}
Expand All @@ -46,8 +46,8 @@ tinymce.PluginManager.add('placeholder', function(editor, url) {
function _fromSrc(s) {
var i,re;
for(i=tokens.length-1; i>=0; i--) {
re = new RegExp('\\[\\!'+tokens[i].escapedToken+'\\](?![^\\<\\>]*\\>)', 'gi');
s = s.replace(re, '<img src="'+tokens[i].image+'" placeholder_data="'+tokens[i].token+'">');
re = new RegExp('\\[\\!'+tokens[i].escapedToken+'([^\\]]*)\\](?![^\\<\\>]*\\>)', 'gi');
s = s.replace(re, '<img src="'+tokens[i].image+'" placeholder_data="'+tokens[i].token+'" placeholder_args="'+"$1"+'">');
}
return s;
}
Expand All @@ -59,15 +59,15 @@ tinymce.PluginManager.add('placeholder', function(editor, url) {
//BEGIN add the attribute placeholder_data as a valid one for img
//note: the attribute list of img was taken from Schema.js
if(editor.settings.extended_valid_elements == undefined)
editor.settings.extended_valid_elements = 'img[src|alt|usemap|ismap|width|height|class|placeholder_data]';
editor.settings.extended_valid_elements = 'img[src|alt|usemap|ismap|width|height|class|placeholder_data|placeholder_args]';
else {
var i = editor.settings.extended_valid_elements.search(/img[\s]*\[[^\[\]]+\]/i);
if(i==-1)
editor.settings.extended_valid_elements += ',img[src|alt|usemap|ismap|width|height|class|placeholder_data]';
editor.settings.extended_valid_elements += ',img[src|alt|usemap|ismap|width|height|class|placeholder_data|placeholder_args]';
else {
var a = editor.settings.extended_valid_elements.substr(i);
a = a.substr(a.indexOf('[')+1);
editor.settings.extended_valid_elements = editor.settings.extended_valid_elements.substring(0,i) + 'img[placeholder_data|' + a;
editor.settings.extended_valid_elements = editor.settings.extended_valid_elements.substring(0,i) + 'img[placeholder_data|placeholder_args|' + a;
}
}
//END add the attribute placeholder_data as a valid one for img
Expand Down
2 changes: 1 addition & 1 deletion placeholder/plugin.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.