QUAL: The library timepicker.js has been removed. Was not used by
Dolibarr.
This commit is contained in:
parent
818f6b1555
commit
142fbf93b0
7 changed files with 2 additions and 2002 deletions
|
|
@ -27,6 +27,7 @@ The following changes may create regressions for some external modules, but were
|
|||
* Adding new document templates must be done by adding files into the mymodule/core/modules/xxx/doc directory. Adding files into custom directory with the
|
||||
same path than the core path without using a mymodule directory is now forbidden.
|
||||
* The directory theme/common/octicons has been removed
|
||||
* The library timepicker.js has been removed
|
||||
|
||||
|
||||
***** ChangeLog for 22.0.1 compared to 22.0.0 *****
|
||||
|
|
|
|||
|
|
@ -250,7 +250,7 @@ class Form
|
|||
}
|
||||
|
||||
// When option to edit inline is activated
|
||||
if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker and support select
|
||||
if (getDolGlobalString('MAIN_USE_JQUERY_JEDITABLE') && !preg_match('/^select;|day|datepicker|dayhour|datehourpicker/', $typeofdata)) {
|
||||
$ret .= $this->editInPlace($object, $value, $htmlname, ($perm ? 1 : 0), $typeofdata, $editvalue, $extObject, $custommsg);
|
||||
} else {
|
||||
if ($editaction == '') {
|
||||
|
|
|
|||
|
|
@ -1,93 +0,0 @@
|
|||
<?php
|
||||
/* Copyright (C) 2012 Regis Houssin <regis.houssin@inodbox.com>
|
||||
* Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||
* Copyright (C) 2024 Frédéric France <frederic.france@free.fr>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \file htdocs/core/js/timepicker.js.php
|
||||
* \brief File that include javascript functions for timepicker
|
||||
*/
|
||||
|
||||
if (!defined('NOREQUIRESOC')) {
|
||||
define('NOREQUIRESOC', '1');
|
||||
}
|
||||
if (!defined('NOCSRFCHECK')) {
|
||||
define('NOCSRFCHECK', 1);
|
||||
}
|
||||
if (!defined('NOTOKENRENEWAL')) {
|
||||
define('NOTOKENRENEWAL', 1);
|
||||
}
|
||||
if (!defined('NOLOGIN')) {
|
||||
define('NOLOGIN', 1);
|
||||
}
|
||||
if (!defined('NOREQUIREMENU')) {
|
||||
define('NOREQUIREMENU', 1);
|
||||
}
|
||||
if (!defined('NOREQUIREHTML')) {
|
||||
define('NOREQUIREHTML', 1);
|
||||
}
|
||||
if (!defined('NOREQUIREAJAX')) {
|
||||
define('NOREQUIREAJAX', '1');
|
||||
}
|
||||
|
||||
session_cache_limiter('public');
|
||||
|
||||
require_once '../../main.inc.php';
|
||||
/**
|
||||
* @var DoliDB $db
|
||||
* @var Translate $langs
|
||||
*
|
||||
* @var int $dolibarr_nocache
|
||||
*/
|
||||
/*
|
||||
* View
|
||||
*/
|
||||
|
||||
// Define javascript type
|
||||
top_httphead('text/javascript; charset=UTF-8');
|
||||
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
|
||||
if (empty($dolibarr_nocache)) {
|
||||
header('Cache-Control: max-age=10800, public, must-revalidate');
|
||||
} else {
|
||||
header('Cache-Control: no-cache');
|
||||
}
|
||||
?>
|
||||
|
||||
// For JQuery Timepicker
|
||||
jQuery(function($){
|
||||
$.timepicker.regional['<?php echo $langs->defaultlang ?>'] = {
|
||||
timeOnlyTitle: '<?php echo $langs->trans("TimeOnly") ?>',
|
||||
timeText: '<?php echo $langs->trans("Time") ?>',
|
||||
hourText: '<?php echo $langs->trans("Hour") ?>',
|
||||
minuteText: '<?php echo $langs->trans("Minute") ?>',
|
||||
secondText: '<?php echo $langs->trans("Second") ?>',
|
||||
millisecText: '<?php echo $langs->trans("Millisecond") ?>',
|
||||
timezoneText: '<?php echo $langs->trans("Timezone") ?>',
|
||||
currentText: '<?php echo $langs->trans("Now") ?>',
|
||||
closeText: '<?php echo $langs->trans("Close2") ?>',
|
||||
timeFormat: 'HH:mm',
|
||||
amNames: ['AM', 'A'],
|
||||
pmNames: ['PM', 'P'],
|
||||
isRTL: <?php echo($langs->trans("DIRECTION") == 'rtl' ? 'true' : 'false'); ?>
|
||||
};
|
||||
$.timepicker.setDefaults($.timepicker.regional['<?php echo $langs->defaultlang ?>']);
|
||||
});
|
||||
|
||||
<?php
|
||||
if (is_object($db)) {
|
||||
$db->close();
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
|
||||
.ui-timepicker-div dl { text-align: left; }
|
||||
.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
|
||||
.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
|
||||
.ui-timepicker-div td { font-size: 90%; }
|
||||
.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
|
||||
|
||||
.ui-timepicker-rtl{ direction: rtl; }
|
||||
.ui-timepicker-rtl dl { text-align: right; }
|
||||
.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1913,11 +1913,6 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
|
|||
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/editinplace.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
|
||||
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
|
||||
}
|
||||
// jQuery Timepicker (no more used by default)
|
||||
if (getDolGlobalString('MAIN_USE_JQUERY_TIMEPICKER') || defined('REQUIRE_JQUERY_TIMEPICKER')) {
|
||||
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
|
||||
print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
|
||||
}
|
||||
if (!defined('DISABLE_SELECT2') && (getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') || defined('REQUIRE_JQUERY_MULTISELECT'))) {
|
||||
// jQuery plugin "mutiselect", "multiple-select", "select2", ...
|
||||
$tmpplugin = !getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : getDolGlobalString('MAIN_USE_JQUERY_MULTISELECT');
|
||||
|
|
|
|||
|
|
@ -83,13 +83,6 @@ top_httphead();
|
|||
// Common dolibarr js functions
|
||||
$jQueryUIJSUrl = $context->rootUrl.'js/lib_head.js.php';
|
||||
print '<script src="'.$jQueryUIJSUrl.'"></script>'."\n";
|
||||
|
||||
// Date picker
|
||||
/*
|
||||
$jDatePickerJSUrl = dirname($context->rootUrl).'/includes/jquery/plugins/timepicker/jquery-ui-timepicker-addon.js';
|
||||
print '<script src="'.$jDatePickerJSUrl.'"></script>'."\n";
|
||||
//print '<script nonce="'.getNonce().'" src="'.DOL_URL_ROOT.'/core/js/timepicker.js.php?lang='.$langs->defaultlang.($ext ? '&'.$ext : '').'"></script>'."\n";
|
||||
*/
|
||||
?>
|
||||
</head>
|
||||
<body data-theme="custom" data-controller="<?php print dol_escape_htmltag($context->controller); ?>">
|
||||
|
|
|
|||
Loading…
Reference in a new issue