Skip to content

Commit

Permalink
add new help plugin to tinymce
Browse files Browse the repository at this point in the history
  • Loading branch information
@dleffler
dleffler committed May 13, 2017
1 parent b7fa3cc commit 92d059b
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 30 deletions.
5 changes: 3 additions & 2 deletions framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
View file
Expand Up @@ -171,7 +171,7 @@ function controlToHTML($name, $label) {
$formattags = "'p;h1;h2;h3;h4;h5;h6;pre;address;div'";
else
$formattags = expString::check_javascript($formattags, true); // $formattags must be enclosed in quotes '..'
if (empty($fontnames))
if (empty($fontnames)) {
$fontnames = "'Arial/Arial, Helvetica, sans-serif;' +
'Comic Sans MS/Comic Sans MS, cursive;' +
'Courier New/Courier New, Courier, monospace;' +
Expand All @@ -181,8 +181,9 @@ function controlToHTML($name, $label) {
'Times New Roman/Times New Roman, Times, serif;' +
'Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;' +
'Verdana/Verdana, Geneva, sans-serif'";
else
} else {
$fontnames = expString::check_javascript($fontnames, true); // $fontnames must be enclosed in quotes '..'
}
$content = "
$(document).ready(function(){
if(typeof(EXPONENT.editor" . createValidId($name) . ") !== 'undefined'){
Expand Down
20 changes: 8 additions & 12 deletions framework/core/forms/controls/bootstrap3/tinymcecontrol.php
View file
Expand Up @@ -77,7 +77,7 @@ function controlToHTML($name, $label)
ajax_action:'1',
json:'1'
},
upload_file_size : '5mb',
upload_file_size : '5mb', //fixme
upload_callback : function(res, file, up) {
if (res.status == 200) {
var response = JSON.parse(res.response);
Expand All @@ -92,11 +92,6 @@ function controlToHTML($name, $label)
},
images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_paste_tinymce.php',
paste_data_images: true,";
// $upload .= "
// images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_tinymce.php',";
// $upload .= "
// paste_data_images: false,
// images_upload_base_path: '" . UPLOAD_DIRECTORY . "',";
} else
$upload = '';
if (!empty($settings)) {
Expand Down Expand Up @@ -127,7 +122,7 @@ function controlToHTML($name, $label)
$plugins = "advlist,autolink,lists,link,image,imagetools,charmap,print,preview,hr,anchor,pagebreak" .
",searchreplace,wordcount,visualblocks,visualchars,code,fullscreen" .
",media,nonbreaking,save,table,contextmenu,directionality" .
",emoticons,paste,textcolor,quickupload,localautosave";
",emoticons,paste,textcolor,quickupload,localautosave,help";
}
// clean up (custom) plugins list from missing plugins
if (!empty($plugins)) {
Expand All @@ -146,7 +141,7 @@ function controlToHTML($name, $label)
} else {
$tb = "
toolbar1: 'undo redo localautosave | styleselect formatselect fontselect fontsizeselect | cut copy paste | bold italic underline removeformat | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent',
toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons";
toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons help";
if (!empty($this->plugin)) {
$plugs = explode(',',trim($this->plugin));
$tb .= ' |';
Expand Down Expand Up @@ -209,14 +204,14 @@ classes: 'img-center'
},
]},
";
} else
} else {
$stylesset = expString::check_javascript($stylesset, false, true); // $styleset must be enclosed in curly braces {..}

}
if (empty($formattags))
$formattags = "'Normal=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Formatted=pre;Address=address;Normal (DIV)=div'";
else
$formattags = expString::check_javascript($formattags, true); // $formattags must be enclosed in quotes '..'
if (empty($fontnames))
if (empty($fontnames)) {
$fontnames = "'Andale Mono=andale mono,times;'+
'Arial=arial,helvetica,sans-serif;'+
'Arial Black=arial black,avant garde;'+
Expand All @@ -235,8 +230,9 @@ classes: 'img-center'
'Webdings=webdings;'+
'Wingdings=wingdings,zapf dingbats'
";
else
} else {
$fontnames = expString::check_javascript($fontnames, true); // $fontnames must be enclosed in quotes '..'
}
$content = "
$(document).ready(function(){
if(typeof(EXPONENT.editor" . createValidId($name) . ") !== 'undefined'){
Expand Down
5 changes: 3 additions & 2 deletions framework/core/forms/controls/ckeditorcontrol.php
View file
Expand Up @@ -171,7 +171,7 @@ function controlToHTML($name, $label) {
$formattags = "'p;h1;h2;h3;h4;h5;h6;pre;address;div'";
else
$formattags = expString::check_javascript($formattags, true); // $formattags must be enclosed in quotes '..'
if (empty($fontnames))
if (empty($fontnames)) {
$fontnames = "'Arial/Arial, Helvetica, sans-serif;' +
'Comic Sans MS/Comic Sans MS, cursive;' +
'Courier New/Courier New, Courier, monospace;' +
Expand All @@ -181,8 +181,9 @@ function controlToHTML($name, $label) {
'Times New Roman/Times New Roman, Times, serif;' +
'Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;' +
'Verdana/Verdana, Geneva, sans-serif'";
else
} else {
$fontnames = expString::check_javascript($fontnames, true); // $fontnames must be enclosed in quotes '..'
}
$content = "
YUI(EXPONENT.YUI3_CONFIG).use('*', function(Y) {
Y.Global.on(\"lazyload:cke\", function () {
Expand Down
18 changes: 7 additions & 11 deletions framework/core/forms/controls/tinymcecontrol.php
View file
Expand Up @@ -92,11 +92,6 @@ function controlToHTML($name, $label)
},
images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_paste_tinymce.php',
paste_data_images: true,";
// $upload .= "
// images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_tinymce.php',";
// $upload .= "
// paste_data_images: false,
// images_upload_base_path: '" . UPLOAD_DIRECTORY . "',";
} else
$upload = '';
if (!empty($settings)) {
Expand Down Expand Up @@ -127,7 +122,7 @@ function controlToHTML($name, $label)
$plugins = "advlist,autolink,lists,link,image,imagetools,charmap,print,preview,hr,anchor,pagebreak" .
",searchreplace,wordcount,visualblocks,visualchars,code,fullscreen" .
",media,nonbreaking,save,table,contextmenu,directionality" .
",emoticons,paste,textcolor,quickupload,localautosave";
",emoticons,paste,textcolor,quickupload,localautosave,help";
}
// clean up (custom) plugins list from missing plugins
if (!empty($plugins)) {
Expand All @@ -146,7 +141,7 @@ function controlToHTML($name, $label)
} else {
$tb = "
toolbar1: 'undo redo localautosave | styleselect formatselect fontselect fontsizeselect | cut copy paste | bold italic underline removeformat | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent',
toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons";
toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons help";
if (!empty($this->plugin)) {
$plugs = explode(',',trim($this->plugin));
$tb .= ' |';
Expand Down Expand Up @@ -209,14 +204,14 @@ classes: 'img-center'
},
]},
";
} else
} else {
$stylesset = expString::check_javascript($stylesset, false, true); // $styleset must be enclosed in curly braces {..}

}
if (empty($formattags))
$formattags = "'Normal=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Formatted=pre;Address=address;Normal (DIV)=div'";
else
$formattags = expString::check_javascript($formattags, true); // $formattags must be enclosed in quotes '..'
if (empty($fontnames))
if (empty($fontnames)) {
$fontnames = "'Andale Mono=andale mono,times;'+
'Arial=arial,helvetica,sans-serif;'+
'Arial Black=arial black,avant garde;'+
Expand All @@ -235,8 +230,9 @@ classes: 'img-center'
'Webdings=webdings;'+
'Wingdings=wingdings,zapf dingbats'
";
else
} else {
$fontnames = expString::check_javascript($fontnames, true); // $fontnames must be enclosed in quotes '..'
}
$content = "
YUI(EXPONENT.YUI3_CONFIG).use('*', function(Y) {
Y.Global.on(\"lazyload:cke\", function () {
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/text/views/text/showall_inline.bootstrap.tpl
View file
Expand Up @@ -262,7 +262,7 @@
} else {
mytoolbar = fullToolbar;
tinymenu = true;
tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave'];
tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave,help'];
}

{/literal}{if $smarty.const.SITE_WYSIWYG_EDITOR == "ckeditor"}{literal}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/text/views/text/showall_inline.bootstrap3.tpl
View file
Expand Up @@ -270,7 +270,7 @@
} else {
mytoolbar = fullToolbar;
tinymenu = true;
tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave'];
tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave,help'];
}

{/literal}{if $smarty.const.SITE_WYSIWYG_EDITOR == "ckeditor"}{literal}
Expand Down
2 changes: 1 addition & 1 deletion framework/modules/text/views/text/showall_inline.tpl
View file
Expand Up @@ -252,7 +252,7 @@
} else {
mytoolbar = fullToolbar;
tinymenu = true;
tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave'];
tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave,help'];
}

{/literal}{if $smarty.const.SITE_WYSIWYG_EDITOR == "ckeditor"}{literal}
Expand Down

0 comments on commit 92d059b

Please sign in to comment.