mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 15:33:23 +01:00
Try to correct ckeditor references point to vendor directory
This commit is contained in:
parent
d3222f5d5f
commit
c3fb98f3c1
@ -17,16 +17,13 @@ svn_branch = svn cp --parents -m "$2" $(svn info|grep ^URL|cut -f 2 -d ' ') $(sv
|
||||
[api/src/Db/ADOdb]
|
||||
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ADOdb.git
|
||||
|
||||
[api/js/ckeditor]
|
||||
checkout = git clone ${EGW_REPO_BASE:-$(git config --get remote.origin.url|sed 's|/egroupware.git||')}/ckeditor.git
|
||||
skip = [ $1 = "tag" -o $1 = "untag" -o $1 = "branch" ]
|
||||
|
||||
[]
|
||||
# to run composer.phar automatic, this .mrconfig need to be trusted by adding it to ~/.mrtrust
|
||||
checkout = git clone git@github.com:EGroupware/egroupware.git &&
|
||||
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install
|
||||
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev
|
||||
update = git stash -q || true ; git pull --rebase ; git stash pop -q 2>/dev/null || true;
|
||||
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install
|
||||
rm -rf api/js/ckeditor;
|
||||
/usr/bin/env $(which composer.phar >/dev/null && echo composer.phar || echo composer) install --no-dev
|
||||
# uncomment for minified javascript and css, IF you have nodejs and grunt installed: npm install -g grunt-cli
|
||||
#post_checkout = /usr/bin/env npm install && /usr/bin/env grunt
|
||||
#post_update = /usr/bin/env npm install && /usr/bin/env grunt
|
||||
|
@ -99,7 +99,7 @@ module.exports = function (grunt) {
|
||||
"api/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js",
|
||||
"api/js/egw_action/egw_menu_dhtmlx.js",
|
||||
"api/js/jquery/chosen/chosen.jquery.js",
|
||||
"api/js/ckeditor/config.js"
|
||||
"vendor/egroupware/ckeditor/config.js"
|
||||
]
|
||||
}
|
||||
},
|
||||
@ -172,7 +172,7 @@ module.exports = function (grunt) {
|
||||
"api/js/etemplate/et2_extension_nextmatch.js",
|
||||
"api/js/etemplate/et2_widget_favorites.js",
|
||||
"api/js/etemplate/et2_widget_html.js",
|
||||
"api/js/ckeditor/adapters/jquery.js",
|
||||
"vendor/egroupware/ckeditor/adapters/jquery.js",
|
||||
"api/js/etemplate/et2_widget_htmlarea.js",
|
||||
"api/js/etemplate/et2_widget_tabs.js",
|
||||
"api/js/etemplate/et2_widget_toolbar.js",
|
||||
|
@ -38,7 +38,7 @@ class admin_messages
|
||||
$GLOBALS['egw']->redirect_link('/admin/index.php');
|
||||
}
|
||||
|
||||
Framework::includeJS('ckeditor','ckeditor');
|
||||
Framework::includeJS('vendor/egroupware/ckeditor/ckeditor.js');
|
||||
|
||||
$GLOBALS['egw']->template->set_file(array('message' => 'mainscreen_message.tpl'));
|
||||
$GLOBALS['egw']->template->set_block('message','form','form');
|
||||
|
@ -13,9 +13,9 @@
|
||||
/*egw:uses
|
||||
jsapi.jsapi; // Needed for egw_seperateJavaScript
|
||||
/vendor/bower-asset/jquery/dist/jquery.js;
|
||||
ckeditor.ckeditor;
|
||||
ckeditor.config;
|
||||
ckeditor.adapters/jquery;
|
||||
/vendor/egroupware/ckeditor/ckeditor.js;
|
||||
/vendor/egroupware/ckeditor/ckeditor.config;
|
||||
/vendor/egroupware/ckeditor/ckeditor.adapters/jquery;
|
||||
et2_core_baseWidget;
|
||||
*/
|
||||
|
||||
|
@ -234,8 +234,8 @@ class Bundle
|
||||
// include choosen in api, as old eTemplate uses it and fail if it pulls in half of et2
|
||||
$inc_mgr->include_js_file('/api/js/jquery/chosen/chosen.jquery.js');
|
||||
// include CKEditor in api, as old eTemplate uses it too
|
||||
$inc_mgr->include_js_file('/api/js/ckeditor/ckeditor.js');
|
||||
$inc_mgr->include_js_file('/api/js/ckeditor/config.js');
|
||||
$inc_mgr->include_js_file('/vendor/egroupware/ckeditor/ckeditor.js');
|
||||
$inc_mgr->include_js_file('/vendor/egroupware/ckeditor/config.js');
|
||||
$bundles['api'] = $inc_mgr->get_included_files();
|
||||
self::urls($bundles['api'], $max_mod['api']);
|
||||
|
||||
|
@ -448,7 +448,7 @@ class Html
|
||||
}
|
||||
|
||||
//include the ckeditor js file
|
||||
Framework::includeJS('ckeditor','ckeditor','phpgwapi');
|
||||
Framework::includeJS('/vendor/egroupware/ckeditor/ckeditor.js');
|
||||
|
||||
// run content through htmlpurifier
|
||||
if ($_purify && !empty($_content))
|
||||
@ -474,7 +474,7 @@ class Html
|
||||
return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true). // true = double encoding
|
||||
'
|
||||
<script type="text/javascript">
|
||||
window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/";
|
||||
window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/vendor/egroupware/ckeditor/";
|
||||
egw_LAB.wait(function() {
|
||||
CKEDITOR.replace("'.$_name.'", '.Html\CkEditorConfig::get_ckeditor_config($_mode,
|
||||
$pxheight, $expanded, $_start_path).');
|
||||
|
@ -25,7 +25,7 @@ class CkEditorConfig
|
||||
private static $enterMode = null;
|
||||
private static $skin = null;
|
||||
|
||||
// Defaults, defined in phpgwapi/js/ckeditor/plugins/font/plugin.js
|
||||
// Defaults, defined in /vendor/egroupware/ckeditor/plugins/font/plugin.js
|
||||
public static $font_options = array(
|
||||
'arial, helvetica, sans-serif' => 'Arial',
|
||||
'Comic Sans MS, cursive' => 'Comic Sans MS',
|
||||
@ -75,7 +75,7 @@ class CkEditorConfig
|
||||
);
|
||||
$skins = array();
|
||||
|
||||
foreach(scandir(EGW_SERVER_ROOT.'/api/js/ckeditor/skins') as $skin)
|
||||
foreach(scandir(EGW_SERVER_ROOT.'/vendor/egroupware/ckeditor/skins') as $skin)
|
||||
{
|
||||
if ($skin[0] == '.') continue;
|
||||
|
||||
@ -163,7 +163,7 @@ class CkEditorConfig
|
||||
private static function get_base_path()
|
||||
{
|
||||
//Get the ckeditor base url
|
||||
return $GLOBALS['egw_info']['server']['webserver_url'].'/api/js/ckeditor/';
|
||||
return $GLOBALS['egw_info']['server']['webserver_url'].'/vendor/egroupware/ckeditor/';
|
||||
}
|
||||
|
||||
/**
|
||||
@ -231,7 +231,7 @@ class CkEditorConfig
|
||||
}
|
||||
|
||||
//Check whether the skin actually exists, if not, switch to a default
|
||||
if (!file_exists(EGW_SERVER_ROOT.'/api/js/ckeditor/skins/'.$skin))
|
||||
if (!file_exists(EGW_SERVER_ROOT.'/vendor/egroupware/ckeditor/skins/'.$skin))
|
||||
{
|
||||
$skin = "moono"; //this is the basic skin for ckeditor
|
||||
}
|
||||
|
@ -263,7 +263,7 @@ function get_modules_per_repo()
|
||||
}
|
||||
if ($line && $line[0] == '[' && preg_match('/^\[([^]]*)\]/', $line, $matches))
|
||||
{
|
||||
if (in_array($matches[1], array('DEFAULT', 'api/js/ckeditor', 'api/src/Accounts/Ads', 'phpgwapi/js/ckeditor', 'phpgwapi/inc/adldap')))
|
||||
if (in_array($matches[1], array('DEFAULT', 'vendor/egroupware/ckeditor', 'api/src/Accounts/Ads', 'phpgwapi/js/ckeditor', 'phpgwapi/inc/adldap')))
|
||||
{
|
||||
$module = null;
|
||||
continue;
|
||||
|
@ -54,7 +54,7 @@ foreach(Bundle::all() as $name => $files)
|
||||
unset($files[$key]);
|
||||
}
|
||||
// ckeditor is loaded separate before the bundle
|
||||
if ($name == 'api' && ($key = array_search('api/js/ckeditor/ckeditor.js', $files)))
|
||||
if ($name == 'api' && ($key = array_search('vendor/egroupware/ckeditor/ckeditor.js', $files)))
|
||||
{
|
||||
unset($files[$key]);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user