Bundle.php

ralfbecker_sf 2016-04-08 10:38:44 UTC #1

Author: ralfbecker
New Revision: 55686

URL: http://svn.stylite.de/viewvc/egroupware?rev=55686&view=rev
Log:
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

Modified:
trunk/egroupware/api/js/jsapi/egw.js
trunk/egroupware/api/src/Framework/Bundle.php

Modified: trunk/egroupware/api/js/jsapi/egw.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/jsapi/egw.js?rev=55686&r1=55685&r2=55686&view=diff

— trunk/egroupware/api/js/jsapi/egw.js (original)
+++ trunk/egroupware/api/js/jsapi/egw.js Fri Apr 8 12:38:44 2016
@@ -151,16 +151,6 @@
window.egw_LAB = $LAB.setOptions({AlwaysPreserveOrder:true,BasePath:window.egw_webserverUrl+’/’});
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()
{
// call egw.link_handler, if attr specified

Modified: trunk/egroupware/api/src/Framework/Bundle.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Framework/Bundle.php?rev=55686&r1=55685&r2=55686&view=diff

— trunk/egroupware/api/src/Framework/Bundle.php (original)
+++ trunk/egroupware/api/src/Framework/Bundle.php Fri Apr 8 12:38:44 2016
@@ -53,8 +53,9 @@
unset($bundles[’.ts’]);
foreach($bundles as $name => $files)
{

  		// to facilitate move to new et2 location, can be removed after 16.1 release

  		if ($name == 'et21' && !in_array('/api/js/etemplate/etemplate2.js', $files))

  		// 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) ||

  			$name == 'api' && !in_array('/api/js/jquery/jquery.js', $files))
  		{
  			Cache::unsetTree(__CLASS__, 'bundles');
  			return self::js_includes($js_includes);

@@ -73,6 +74,8 @@
$query = null;
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 (($bundle = $file2bundle[$file]))

@@ -135,8 +138,6 @@
$query = null;
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);
  	list($path,$query) = explode('?',$path,2);
  	$mod = filemtime(EGW_SERVER_ROOT.$path);

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs