mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-02-06 23:39:11 +01:00
Code Issues Releases Wiki Activity

Merge pull request #2352 from lonalore/master

Browse Source 
Library path fix for tinymce4.
This commit is contained in:
Cameron 2017-01-30 07:58:47 -08:00 committed by GitHub
commit 76997558b0
2 changed files with 12 additions and 4 deletions
Show Stats 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',
);
@ -183,7 +184,7 @@ class core_library
),
),
// Override library path.
'library_path' => '{e_WEB}lib/jquery-once/',
'library_path' => '{e_WEB}lib/jquery-once',
);
// jQuery UI (CDN).
@ -362,6 +363,7 @@ class core_library
),
),
),
'library_path' => '{e_WEB}lib/bootstrap',
'path' => '3.3.7',
);

12
e107_plugins/tinymce4/wysiwyg.php
View File

@ -734,12 +734,18 @@ class wysiwyg
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(
0 => e107::getLibrary()->getProperty('bootstrap','library_path').'dist/css/bootstrap.min.css',
1 => e107::getLibrary()->getProperty('fontawesome','library_path').'css/font-awesome.min.css',
2 => e_PLUGIN_ABS.'tinymce4/editor.css'
0 => $pathBS . '/dist/css/bootstrap.min.css',
1 => $pathFA . '/css/font-awesome.min.css',
2 => e_PLUGIN_ABS . 'tinymce4/editor.css',
);
$editorCSS = $tp->replaceConstants($editorCSS, 'abs');