Changeset 2473 for trunk/phpgwapi

Timestamp:

04/09/10 12:22:03 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Permitindo que o ExpressoContacts? não realize reload de página.

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (2 diffs)
• js/tools/xlink.js (modified) (2 diffs)

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

@@ -1230 +1230 @@
                         $GLOBALS['phpgw']->js->validate_file('expressoAjax','expressoAjax');
 
+                        $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 $GLOBALS['phpgw']->js->get_script_links();
@@ -1236 +1238 @@
 
                         $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax');
+
+                        // TODO
+                        // Esse javascript será carregado sempre pois causa grandes
+                        // problemas em diversos módulos. Algum dia será substituido.
+                        $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','wz_dragdrop');
 
                         if (!@$GLOBALS['phpgw_info']['flags']['nonavbar'] && !@$GLOBALS['phpgw_info']['flags']['navbar_target'])

trunk/phpgwapi/js/tools/xlink.js

@@ -16 +16 @@
                 var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( '=admin.' ) > 0 );
                 a = ( a || action.indexOf( 'home' ) > 0 );
+                a = ( a || action.indexOf( 'contactcenter' ) > 0 );
                 a = ( a || action.indexOf( 'expressoAdmin1_2' ) > 0 );
                 a = ( a || action.indexOf( 'abberit_messenger' ) > 0 );
@@ -48 +49 @@
         XEvents.add( window, 'onload', function( )
         {
+                var _center = document.createElement( 'center' );
+                _center.appendChild( _loading );
+
                 _container = document.getElementById( 'divAppbox' );
+                _loading = _center;
+
                 document.getElementsByTagName( 'body' ).item( 0 ).style.overflowY = 'scroll';
+
                 var links = document.getElementsByTagName( 'a' );
                 for ( var i = 0; i < links.length; i++ )