Changeset 2547 for trunk/phpgwapi/inc

Timestamp:

04/15/10 11:19:50 (14 years ago)

Author:

amuller

Message:

Ticket #1036 - Corrigindo js e otimizando a criação do jspack

Location:

trunk/phpgwapi/inc

Files:

• class.common.inc.php (modified) (1 diff)
• class.javascript.inc.php (modified) (1 diff)

trunk/phpgwapi/inc/class.common.inc.php

@@ -1232 +1232 @@
                         $GLOBALS['phpgw']->js->validate_file('wz_dragdrop','wz_dragdrop');
 
-                        echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>";
+                        echo "\n<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>\n";
                         echo $GLOBALS['phpgw']->js->get_script_links();
 

trunk/phpgwapi/inc/class.javascript.inc.php

@@ -134 +134 @@
                                                                         if ($GLOBALS['phpgw_info']['server']['jspacker'] == "True")
                                                                         {
-                                                                                require_once('class.JavaScriptPacker.php');
-                                                                                $script = file_get_contents(PHPGW_INCLUDE_ROOT .SEP .$app .SEP .'js' .SEP . $pkg .SEP. $file . '.js');
-                                                                                $packer = new JavaScriptPacker($script, 'Normal', true, false);
-                                                                                $packed = $packer->pack();
-                                                                                $links .= "<script>".$packed."</script>\n";
-                                                                        }
+                                                                                $filePath=PHPGW_INCLUDE_ROOT.SEP.$app.SEP.'js'.SEP.$pkg.SEP.$file.'.js';
+                                                                                if (!file_exists($filePath."pack.js"))
+                                                                                {
+                                                                                        $fp = fopen($filePath."pack.js", 'w');
+                                                                                        $script = file_get_contents($filePath);
+                                                                                        require_once('class.JavaScriptPacker.php');
+                                                                                        $packer = new JavaScriptPacker($script, 'Normal', true, false);
+                                                                                        $packed = $packer->pack();
+                                                                                        fwrite($fp, $packed);
+                                                                                        fclose($fp);
+                                                                                }
+                                                                                $links .= '<script type="text/javascript" src="'
+                                                                                        .$GLOBALS['phpgw_info']['server']['webserver_url']
+                                                                                        ."/$app/js/$pkg/$file" . ".jspack.js\"></script>\n";
+                                                                        }       
                                                                         else
                                                                         {