mirror of
https://github.com/e107inc/e107.git
synced 2025-08-01 20:30:39 +02:00
JS datetimepicker() updated to latest version. Fixed datetimepicker() to respect the e107 timezone setting while saving as UTC. ie (admin > prefs > Date Display Options ) or the user's timezone setting (usersettings.php when the timezone user-extended field is enabled) .
This commit is contained in:
@@ -1957,6 +1957,9 @@ function init_session()
|
||||
unset($tz);
|
||||
}
|
||||
|
||||
e107::getDebug()->log("Timezone: ".USERTIMEZONE); // remove later on.
|
||||
|
||||
|
||||
define('USERIP', e107::getIPHandler()->getIP(FALSE));
|
||||
define('POST_REFERER', md5($user->getToken()));
|
||||
|
||||
|
@@ -1499,11 +1499,11 @@ class e_form
|
||||
if(vartrue($options['inline']))
|
||||
{
|
||||
$text .= "<div class='{$class}' id='inline-{$id}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}'></div>";
|
||||
$text .= "<input type='hidden' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' />";
|
||||
$text .= "<input type='hidden' name='{$name}' id='{$id}' value='{$value}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-firstday='{$firstDay}' data-date-timezone-offset='".date('Z')."' />";
|
||||
}
|
||||
else
|
||||
{
|
||||
$text .= "<input class='{$class} input-".$xsize." form-control' type='text' size='{$size}' id='e-datepicker-{$id}' value='{$value}' data-date-unix ='{$useUnix}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} {$disabled} />";
|
||||
$text .= "<input class='{$class} input-".$xsize." form-control' type='text' size='{$size}' id='e-datepicker-{$id}' value='{$value}' data-date-unix ='{$useUnix}' data-date-format='{$dformat}' data-date-ampm='{$ampm}' data-date-language='".e_LAN."' data-date-firstday='{$firstDay}' {$required} {$disabled} data-date-timezone-offset='".date('Z')."' />";
|
||||
$ftype = (!empty($options['debug'])) ? 'text' : 'hidden';
|
||||
$text .= "<input type='{$ftype}' name='{$name}' id='{$id}' value='{$hiddenValue}' />";
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
@@ -36,7 +36,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
|
||||
autoclose: true,
|
||||
format: $item.attr("data-date-format"),
|
||||
weekStart: $item.attr("data-date-firstday"),
|
||||
language: $item.attr("data-date-language")
|
||||
language: $item.attr("data-date-language"),
|
||||
}).on("changeDate", function (ev) {
|
||||
var useUnix = $(this).attr("data-date-unix");
|
||||
var newValue = "";
|
||||
@@ -49,7 +49,11 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
|
||||
newValue = $("#" + ev.target.id).val();
|
||||
}
|
||||
|
||||
$(newTarget).val(newValue);
|
||||
// make sure a UTC datestamp is saved
|
||||
offset = parseInt($item.attr("data-date-timezone-offset"));
|
||||
newOffsetValue = newValue + offset;
|
||||
|
||||
$(newTarget).val(newOffsetValue);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -62,6 +66,7 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
|
||||
weekStart: $item.attr("data-date-firstday"),
|
||||
showMeridian: $item.attr("data-date-ampm"),
|
||||
language: $item.attr("data-date-language")
|
||||
|
||||
}).on("changeDate", function (ev) {
|
||||
var useUnix = $(this).attr("data-date-unix");
|
||||
var newValue = "";
|
||||
@@ -74,7 +79,14 @@ var e107 = e107 || {'settings': {}, 'behaviors': {}};
|
||||
newValue = $("#" + ev.target.id).val();
|
||||
}
|
||||
|
||||
$(newTarget).val(newValue);
|
||||
// make sure a UTC datestamp is saved
|
||||
offset = parseInt($item.attr("data-date-timezone-offset"));
|
||||
newOffsetValue = newValue + offset;
|
||||
|
||||
$(newTarget).val(newOffsetValue);
|
||||
|
||||
console.log( newOffsetValue); // remove later.
|
||||
|
||||
})
|
||||
});
|
||||
}
|
||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user