qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cke 4.5.1 - fix 2.0 ML popup

Browse source
This commit is contained in:
Ian 2014-10-14 15:51:29 +02:00
parent 7d42aeb1b2
commit 3bb5028720
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
serendipity_event_ckeditor/cke_plugin.js
View file

@ -3,7 +3,7 @@
*/
/**
* @fileOverview A Serendipity serendipity_event_ckeditor custom CKEDITOR additional plugin creator file: cke_plugin.js, v. 1.6, 2014-10-13
* @fileOverview A Serendipity serendipity_event_ckeditor custom CKEDITOR additional plugin creator file: cke_plugin.js, v. 1.7, 2014-10-14
*/
// define array for hooked s9y plugins
@ -178,7 +178,7 @@ function Spawnnuggets(item, addEP, jsED) {
var execcom = ecfit(jsEventData[i].javascript);
editor.addCommand( jsEventData[i].id+nugget, {
exec: function( editor ) {
eval(execcom); // [OK] only way this code is executable
eval(execcom);
}
});
editor.ui.addButton(jsEventData[i].id+nugget, {
@ -192,7 +192,11 @@ function Spawnnuggets(item, addEP, jsED) {
}
editor.addCommand( 's9yML'+area, {
exec : function( editor ) {
window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
if (false === S9Y_VERSION_NEW) {
window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
} else {
serendipity.openPopup('serendipity_admin.php?serendipity[adminModule]=media&serendipity[noBanner]=true&serendipity[noSidebar]=true&serendipity[noFooter]=true&serendipity[showMediaToolbar]=false&serendipity[showUpload]=true&serendipity[textarea]='+textarea_instance);
}
}
});
editor.ui.addButton('s9yML'+area, {

7
serendipity_event_ckeditor/serendipity_event_ckeditor.php
View file

@ -75,7 +75,7 @@ class serendipity_event_ckeditor extends serendipity_event
'CKEditor-Plugin: procurator, v. 1.5 (Serendipity placeholder Plugin, 2014-10-10)',
'CKEditor-Plugin: cheatsheet, v. 1.2 (Serendipity CKE-Cheatsheet Plugin, 2014-09-02)',
'CKEditor-S9yCustomConfig, cke_config.js, v. 2.1, 2014-10-13',
'CKEditor-S9yCustomPlugins, cke_plugin.js, v. 1.6, 2014-10-13',
'CKEditor-S9yCustomPlugins, cke_plugin.js, v. 1.7, 2014-10-14',
'Prettify: JS & CSS files, v. "current", (http://code.google.com/p/google-code-prettify/, 2013-03-04)');
@ -171,7 +171,7 @@ class serendipity_event_ckeditor extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_CKEDITOR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Rustam Abdullaev, Ian');
$propbag->add('version', '4.5.0'); // is CKEDITOR Series 4 (hidden) - revision .4.5 - and appended plugin revision .0
$propbag->add('version', '4.5.1'); // is CKEDITOR Series 4 (hidden) - revision .4.5 - and appended plugin revision .1
$propbag->add('copyright', 'GPL or LGPL License');
$propbag->add('requirements', array(
'serendipity' => '1.7',
@ -431,6 +431,7 @@ class serendipity_event_ckeditor extends serendipity_event
CKEDITOR_PLUGPATH = '<?php echo $plgpath; ?>';
CKEDITOR_MLIMGPATH = '<?php echo $serendipity['serendipityHTTPPath'] . 'plugins/serendipity_event_ckeditor/img/mls9y.png'; ?>';
S9Y_BASEURL = '<?php echo $serendipity['defaultBaseURL']; ?>';
S9Y_VERSION_NEW = <?php echo $serendipity['version'][0] < 2 ? 'false' : 'true'; ?>;
CONFIG_ACF_OFF = <?php echo $acf_off; ?>;
CONFIG_CODE_ON = <?php echo $code_on; ?>;
CONFIG_TOOLBAR = '<?php echo $toolbar; ?>';
@ -499,7 +500,7 @@ ol.linenums li {
<?php
// do not use in 2.0 versions
if ($serendipity['version'][0] == '1') {
if ($serendipity['version'][0] < 2) {
echo file_get_contents(dirname(__FILE__) . '/cke_olds9y.css');
}
if (!strpos($eventData, '.cke_config_block')) {