[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11127] api: include all js in combine
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11127] api: include all js in combine |
|
Date: |
Fri, 24 May 2013 07:55:08 +0000 |
Revision: 11127
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11127
Author: sigurdne
Date: 2013-05-24 07:53:58 +0000 (Fri, 24 May 2013)
Log Message:
-----------
api: include all js in combine
Modified Paths:
--------------
trunk/phpgwapi/inc/class.js.inc.php
Modified: trunk/phpgwapi/inc/class.js.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.js.inc.php 2013-05-24 07:50:29 UTC (rev 11126)
+++ trunk/phpgwapi/inc/class.js.inc.php 2013-05-24 07:53:58 UTC (rev 11127)
@@ -176,6 +176,25 @@
}
}
+ if ( !empty($this->external_files) &&
is_array($this->external_files) )
+ {
+ foreach($this->external_files as $file)
+ {
+ if($combine)
+ {
+ // Add file path to array and
replace path separator with "--" for URL-friendlyness
+ $jsfiles[] = str_replace('/',
'--', ltrim($file,'/'));
+ }
+ else
+ {
+ $links .= <<<HTML
+ <script type="text/javascript"
src="{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$file}" >
+ </script>
+HTML;
+ }
+ }
+ }
+
if($combine)
{
$cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
@@ -186,20 +205,6 @@
unset($jsfiles);
}
-
- if ( !empty($this->external_files) &&
is_array($this->external_files) )
- {
- foreach($this->external_files as $file)
- {
- $links .= <<<HTML
- <script type="text/javascript"
src="{$GLOBALS['phpgw_info']['server']['webserver_url']}/{$file}" >
- </script>
-HTML;
- }
- }
-
-
-
return $links;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11127] api: include all js in combine,
Sigurd Nes <=