[Fmsystem-commits] [14533] remove reference to yaho

[Sigurd Nes]

Revision: 14533
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14533
Author:   sigurdne
Date:     2015-12-06 12:45:08 +0000 (Sun, 06 Dec 2015)
Log Message:
-----------
remove reference to yaho

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
    branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
    branches/dev-syncromind/phpgwapi/templates/portico/js/ajax_jsmenu.js

Modified: branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php  
2015-12-06 12:28:27 UTC (rev 14532)
+++ branches/dev-syncromind/booking/inc/class.uisystem_message.inc.php  
2015-12-06 12:45:08 UTC (rev 14533)
@@ -38,9 +38,7 @@
                        $GLOBALS['phpgw_info']['apps']['manual']['section'] = 
'booking_manual';
 //                     self::add_javascript('booking', 'booking', 
'datatable.js');
                         phpgwapi_jquery::load_widget('autocomplete');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('paginator');
-            
+           
                        $data = array(
                                'form' => array(
                                        'toolbar' => array(

Modified: branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php
===================================================================
--- branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php  
2015-12-06 12:28:27 UTC (rev 14532)
+++ branches/dev-syncromind/phpgwapi/inc/class.uicommon_jquery.inc.php  
2015-12-06 12:45:08 UTC (rev 14533)
@@ -52,15 +52,15 @@
                public function __construct($currentapp ='', $yui = '')
                {
                        // start: to be removed
-                       phpgw::import_class('phpgwapi.yui');
-                       phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('history');
-                       phpgwapi_yui::load_widget('paginator');
-                       phpgwapi_yui::load_widget('menu');
-                       phpgwapi_yui::load_widget('calendar');
-                       phpgwapi_yui::load_widget('autocomplete');
-                       phpgwapi_yui::load_widget('animation');
+//                     phpgw::import_class('phpgwapi.yui');
+//                     phpgwapi_yui::load_widget('dragdrop');
+//                     phpgwapi_yui::load_widget('datatable');
+//                     phpgwapi_yui::load_widget('history');
+//                     phpgwapi_yui::load_widget('paginator');
+//                     phpgwapi_yui::load_widget('menu');
+//                     phpgwapi_yui::load_widget('calendar');
+//                     phpgwapi_yui::load_widget('autocomplete');
+//                     phpgwapi_yui::load_widget('animation');
                        //end: to be removed
 
                        $yui = isset($yui) && $yui == 'yui3' ? 'yui3' : 'yahoo';
@@ -77,10 +77,9 @@
                        if($yui == 'yui3')
                        {
                                self::add_javascript('phpgwapi', 'yui3', 
'yui/yui-min.js');
+                               self::add_javascript('phpgwapi', $yui, 
'common.js');
                        }
 
-                       self::add_javascript('phpgwapi', $yui, 'common.js');
-
                        self::add_javascript('phpgwapi', "jquery", 'common.js');
 
                        $this->url_prefix = str_replace('_', '.', 
get_class($this));

Modified: branches/dev-syncromind/phpgwapi/templates/portico/js/ajax_jsmenu.js
===================================================================
--- branches/dev-syncromind/phpgwapi/templates/portico/js/ajax_jsmenu.js        
2015-12-06 12:28:27 UTC (rev 14532)
+++ branches/dev-syncromind/phpgwapi/templates/portico/js/ajax_jsmenu.js        
2015-12-06 12:45:08 UTC (rev 14533)
@@ -69,7 +69,7 @@
                }
                setTimeout(function () {
                        window.location.href = data.node.original.url;
-               }, 100);
+               }, 200);
 
        });
 });