Changeset 2169 for trunk/phpgwapi

Timestamp:

03/05/10 10:14:04 (14 years ago)

Author:

amuller

Message:

Ticket #911 - Unificação da parte ajax do expresso

Location:

trunk/phpgwapi/inc

Files:

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

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

@@ -1225 +1225 @@
                         $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax');
                         echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>";
+                        echo $GLOBALS['phpgw']->js->get_script_links();
+                        $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax');
 
                         if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])

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

@@ -185 +185 @@
                 function unset_script_link($app, $package, $file=False)
                 {
-                        /* THIS DOES NOTHING ATM :P
                         if($file !== False)
                         {
@@ -194 +193 @@
                                 unset($this->files[$app][$package]);
                         }
-                        */
                 }