extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed ckeditor problems if minifying was switched off, caused by egw.js loaded twice, removed old file-name based workaround on client-side in favor of not requesting it from server-side

Browse Source
This commit is contained in:
Ralf Becker 2016-04-08 10:38:44 +00:00
parent 21c331d5ce
commit 8325963b06
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/js/jsapi/egw.js
View File

@ -151,16 +151,6 @@
window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+'/'}); window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+'/'});
var include = JSON.parse(egw_script.getAttribute('data-include')); var include = JSON.parse(egw_script.getAttribute('data-include'));
// remove this script from include, until server-side no longer requires it
for(var i=0; i < include.length; ++i)
{
if (include[i].match(/^phpgwapi\/js\/jsapi\/egw\.js/))
{
include.splice(i, 1);
break;
}
}
window.egw_LAB.script(include).wait(function() window.egw_LAB.script(include).wait(function()
{ {
// call egw.link_handler, if attr specified // call egw.link_handler, if attr specified

9
api/src/Framework/Bundle.php
View File

@ -53,8 +53,9 @@ class Bundle
unset($bundles['.ts']); unset($bundles['.ts']);
foreach($bundles as $name => $files) foreach($bundles as $name => $files)
{ {
// to facilitate move to new et2 location, can be removed after 16.1 release // to facilitate move to new api/et2 location, can be removed after 16.1 release
if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files)) if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files) ||
$name == 'api' && !in_array('/api/js/jquery/jquery.js', $files))
{ {
Cache::unsetTree(__CLASS__, 'bundles'); Cache::unsetTree(__CLASS__, 'bundles');
return self::js_includes($js_includes); return self::js_includes($js_includes);
@ -73,6 +74,8 @@ class Bundle
$query = null; $query = null;
foreach($js_includes as $file) foreach($js_includes as $file)
{ {
if ($file == '/api/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice!
if (!isset($to_include[$file])) if (!isset($to_include[$file]))
{ {
if (($bundle = $file2bundle[$file])) if (($bundle = $file2bundle[$file]))
@ -135,8 +138,6 @@ class Bundle
$query = null; $query = null;
foreach($js_includes as $path) foreach($js_includes as $path)
{ {
if ($path == '/api/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice!
unset($query); unset($query);
list($path,$query) = explode('?',$path,2); list($path,$query) = explode('?',$path,2);
$mod = filemtime(EGW_SERVER_ROOT.$path); $mod = filemtime(EGW_SERVER_ROOT.$path);