Changeset 2439 for trunk/phpgwapi

Timestamp:

04/07/10 08:17:49 (14 years ago)

Author:

rodsouza

Message:

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

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (1 diff)
• inc/class.jscalendar.inc.php (modified) (1 diff)
• inc/class.phpgw.inc.php (modified) (1 diff)
• js/tools/xlink.js (modified) (1 diff)
• js/wz_dragdrop/wz_dragdrop.js (modified) (1 diff)

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

@@ -1232 +1232 @@
                         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','tools' );
 
                         $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax');

trunk/phpgwapi/inc/class.jscalendar.inc.php

@@ -83 +83 @@
                         return
 '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/>
+<img id="'.$name.'-trigger" src="'.$GLOBALS['phpgw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>
 <script type="text/javascript">
-        document.writeln(\'<img id="'.$name.'-trigger" src="'.$GLOBALS['phpgw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');
         Calendar.setup(
         {

trunk/phpgwapi/inc/class.phpgw.inc.php

@@ -151 +151 @@
                                 if ( strpos( $url, '?' ) === false )
                                         $url .= '?';
+                                else
+                                        $url .= '&';
                                 $url .= 'BackgroundRequest=requested';
                         }

trunk/phpgwapi/js/tools/xlink.js

@@ -11 +11 @@
                 */
                 var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( '=admin.' ) > 0 );
+                a = ( a || action.indexOf( 'calendar/' ) > 0 || action.indexOf( '=calendar.' ) > 0 );
                 a = ! ( a && ! ( action.indexOf( '#' ) === 0 || action.indexOf( window.location + '#' ) === 0 || action.indexOf( 'javascript:' ) === 0 ) );
 

trunk/phpgwapi/js/wz_dragdrop/wz_dragdrop.js

@@ -1315 +1315 @@
                 }
         }
-        if (dd.n4 || dd.n6 || dd.ie || dd.op || dd.w3c) document.write(
-                (dd.n4? '<div style="position:absolute;"><\/div>\n'
-                : (dd.op && !dd.op6)? '<div id="OpBlUr" style="position:absolute;visibility:hidden;width:0px;height:0px;"><form><input type="text" style="width:0px;height:0px;"><\/form><\/div>'
-                : '') + d_htm
-        );
+        //if (dd.n4 || dd.n6 || dd.ie || dd.op || dd.w3c) document.write(
+        //      (dd.n4? '<div style="position:absolute;"><\/div>\n'
+        //      : (dd.op && !dd.op6)? '<div id="OpBlUr" style="position:absolute;visibility:hidden;width:0px;height:0px;"><form><input type="text" style="width:0px;height:0px;"><\/form><\/div>'
+        //      : '') + d_htm
+        //);
         dd.z = 0x33;
         d_i = dd.elements.length; while (d_i--)