diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php index 961cfd5733c..c884344dd1f 100644 --- a/htdocs/core/class/menubase.class.php +++ b/htdocs/core/class/menubase.class.php @@ -547,7 +547,6 @@ class Menubase $tmpcond=$menu['enabled']; if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond); // Force part of condition to true $enabled = verifCond($tmpcond); - //if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) && empty($conf->dol_use_jmobile) && preg_match('/^\$leftmenu/',$menu['enabled'])) $enabled=1; } // Define $title diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7140c04a80c..68f341e612b 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1177,6 +1177,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs { // We must force not using ajax because cache of jquery does not load js of other pages. // This also increase seriously speed onto mobile device where complex js code is very slow and memory very low. + // Note: dol_use_jmobile=1 use jmobile without ajax, dol_use_jmobile=2 use jmobile with ajax if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3)) { print ''; } - /* This make menu bugged - if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) && empty($conf->dol_use_jmobile)) - { - print "\n".''; - } */ - // Wrapper to show tooltips print "\n".'