Changeset 2011 for trunk/phpgwapi/inc/class.common.inc.php

Timestamp:

02/12/10 14:10:40 (14 years ago)

Author:

amuller

Message:

Ticket #911 - Correção e melhorias na unificação

File:

• trunk/phpgwapi/inc/class.common.inc.php (modified) (1 diff)

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

@@ -1221 +1221 @@
                         } 
 
-                        echo "<script type='text/javascript' src='".$GLOBALS['phpgw_info']['server']['webserver_url']."/phpgwapi/expressoAjax/expressoAjax.js'></script>";
-
+//                      echo "<script type='text/javascript' src='".$GLOBALS['phpgw_info']['server']['webserver_url']."/phpgwapi/js/expressoAjax/expressoAjax.js'></script>";
+                        if(!@is_object($GLOBALS['phpgw']->js))
+                        {
+                                $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+                        }
+                        $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax');
+                        echo $GLOBALS['phpgw']->js->get_script_links();
                 }