Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorWilliam Desportes <williamdes@wdes.fr>2019-12-25 01:44:28 +0300
committerWilliam Desportes <williamdes@wdes.fr>2019-12-25 01:46:58 +0300
commitb8a6425f4e4f09e389a8065f6dd7459cf95183ed (patch)
tree4e13516d2d07bbb723e0701091a03baed643d8a6 /js
parentb9e9346a21389d8c6cbcf35ad680f51aa32fe6f5 (diff)
parent1a605524174666bd6364d92c8706038eeb6cd9d8 (diff)
Merge #15685 - Fix #15682 - Timestamp method not taking current time
Pull-request: #15685 Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'js')
-rw-r--r--js/functions.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/js/functions.js b/js/functions.js
index 88263b60ff..de2cd8fe61 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -98,7 +98,13 @@ function PMA_addDatepicker ($this_element, type, options) {
showTimepicker = false;
}
+ // Getting the current Date and time
+ var currentDateTime = new Date();
+
var defaultOptions = {
+ hour: currentDateTime.getHours(),
+ minute: currentDateTime.getMinutes(),
+ second: currentDateTime.getSeconds(),
showOn: 'button',
buttonImage: themeCalendarImage, // defined in js/messages.php
buttonImageOnly: true,