mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Library path fix for tinymce4.

Browse Source
This commit is contained in:
lonalore
2017-01-30 14:06:04 +01:00
parent a5087b9bdc
commit 7f9a3dce0c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/library_manager.php
View File

@@ -112,6 +112,7 @@ class core_library
), ),
), ),
), ),
'library_path' => '{e_WEB}lib/jquery',
'path' => '2.2.4', 'path' => '2.2.4',
); );
@@ -183,7 +184,7 @@ class core_library
), ),
), ),
// Override library path. // Override library path.
'library_path' => '{e_WEB}lib/jquery-once/', 'library_path' => '{e_WEB}lib/jquery-once',
); );
// jQuery UI (CDN). // jQuery UI (CDN).
@@ -362,6 +363,7 @@ class core_library
), ),
), ),
), ),
'library_path' => '{e_WEB}lib/bootstrap',
'path' => '3.3.7', 'path' => '3.3.7',
); );

12
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -734,12 +734,18 @@ class wysiwyg
e_PLUGIN_ABS.'tinymce4/editor.css', e_PLUGIN_ABS.'tinymce4/editor.css',
); );
*/ */
$pathBS = e107::getLibrary()->getProperty('bootstrap', 'library_path');
$pathBS .= '/';
$pathBS .= e107::getLibrary()->getProperty('bootstrap', 'path'); // sub-folder
$pathFA = e107::getLibrary()->getProperty('fontawesome', 'library_path');
$pathFA .= '/';
$pathFA .= e107::getLibrary()->getProperty('fontawesome', 'path'); // sub-folder
$editorCSS = array( $editorCSS = array(
0 => e107::getLibrary()->getProperty('bootstrap','library_path').'dist/css/bootstrap.min.css', 0 => $pathBS . '/dist/css/bootstrap.min.css',
1 => e107::getLibrary()->getProperty('fontawesome','library_path').'css/font-awesome.min.css', 1 => $pathFA . '/css/font-awesome.min.css',
2 => e_PLUGIN_ABS.'tinymce4/editor.css' 2 => e_PLUGIN_ABS . 'tinymce4/editor.css',
); );
$editorCSS = $tp->replaceConstants($editorCSS, 'abs'); $editorCSS = $tp->replaceConstants($editorCSS, 'abs');