mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 06:07:32 +02:00
Code Issues Releases Wiki Activity

Issue #1155, Issue #1035, and possibly related to Issue #928. These changes are precautions. Still not sure what is causing it.

Browse Source
This commit is contained in:
Cameron
2015-07-28 10:04:17 -07:00
parent f44c6b21c7
commit 585cae01ad
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
e107_handlers/form_handler.php
View File

@@ -1395,8 +1395,18 @@ class e_form
$bbbar = ''; $bbbar = '';
$help_tagid = $this->name2id($name)."--preview"; $help_tagid = $this->name2id($name)."--preview";
$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);' {$height}";
if(e107::wysiwyg(true) === false) // bbarea loaded, so activate wysiwyg (if enabled in preferences)
{
$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);' {$height}";
}
else
{
$options['other'] = " ".$height;
}
$counter = vartrue($options['counter'],false); $counter = vartrue($options['counter'],false);
@@ -1411,7 +1421,7 @@ class e_form
$_SESSION['media_category'] = $mediaCat; // used by TinyMce. $_SESSION['media_category'] = $mediaCat; // used by TinyMce.
e107::wysiwyg(true); // bbarea loaded, so activate wysiwyg (if enabled in preferences)
return $ret; return $ret;

2
e107_handlers/js_manager.php
View File

@@ -244,7 +244,7 @@ class e_jsmanager
if(e107::getPref('admintheme')=='bootstrap3') // Bootstrap 3 admin area. if(e107::getPref('admintheme')=='bootstrap3') // Bootstrap 3 admin area.
{ {
$this->_libraries['jquery'] = array( $this->_libraries['jquery'] = array(
"http://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js", "http://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js",
"https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js", "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js",
"https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/themes/smoothness/jquery-ui.css", "https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/themes/smoothness/jquery-ui.css",
// "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js", // "http://ajax.googleapis.com/ajax/libs/jqueryui/1.10.1/jquery-ui.min.js",

4
e107_plugins/tinymce4/e_footer.php
View File

@@ -19,7 +19,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
//e107::js('tinymce','tiny_mce.js','jquery'); //e107::js('tinymce','tiny_mce.js','jquery');
//e107::js('tinymce','wysiwyg.php','jquery',5); //e107::js('tinymce','wysiwyg.php','jquery',5);
e107::js('footer', "http://tinymce.cachefly.net/4.1/tinymce.min.js"); e107::js('footer', "http://tinymce.cachefly.net/4.2/tinymce.min.js");
e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5); e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5);
// e107::js('inline', " // e107::js('inline', "
// tinymce.init({selector:'.e-wysiwyg'}); // tinymce.init({selector:'.e-wysiwyg'});
@@ -85,6 +85,8 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
return false; return false;
}); });
/* /*
$('img.tinyInsertEmote').live('click',function() { $('img.tinyInsertEmote').live('click',function() {

8
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -166,7 +166,13 @@ class wysiwyg
$this->getConfig($config); $this->getConfig($config);
$text = "\n /* TinyMce Config: ".$this->configName." */\n\n"; $text = "\n /* TinyMce Config: ".$this->configName." */\n\n";
$text .= "tinymce.init({\n"; $text .= "tinymce.init({\n";
/* $text .= "setup: function (editor) {
editor.on('blur', function () {
editor.save();
});
},\n";*/
$text .= $this->config; // Moc: temporary fix for BC with PHP 5.3: https://github.com/e107inc/e107/issues/614 $text .= $this->config; // Moc: temporary fix for BC with PHP 5.3: https://github.com/e107inc/e107/issues/614
$text .= "\n});"; $text .= "\n});";
@@ -319,7 +325,7 @@ class wysiwyg
$ret = array( $ret = array(
'selector' => '.e-wysiwyg', 'selector' => '.e-wysiwyg',
'theme' => 'modern',
'plugins' => $this->filter_plugins($config['tinymce_plugins']), 'plugins' => $this->filter_plugins($config['tinymce_plugins']),
'language' => $this->tinymce_lang() 'language' => $this->tinymce_lang()