(js) Fix date parsing on Safari
This commit is contained in:
parent
53b2e19fee
commit
8a177bea47
|
@ -65,6 +65,7 @@
|
||||||
|
|
||||||
angular.extend(_this.defaults, data);
|
angular.extend(_this.defaults, data);
|
||||||
|
|
||||||
|
// Configure date locale
|
||||||
angular.extend(Preferences.$mdDateLocaleProvider, data.locale);
|
angular.extend(Preferences.$mdDateLocaleProvider, data.locale);
|
||||||
Preferences.$mdDateLocaleProvider.firstDayOfWeek = parseInt(data.SOGoFirstDayOfWeek);
|
Preferences.$mdDateLocaleProvider.firstDayOfWeek = parseInt(data.SOGoFirstDayOfWeek);
|
||||||
Preferences.$mdDateLocaleProvider.weekNumberFormatter = function(weekNumber) {
|
Preferences.$mdDateLocaleProvider.weekNumberFormatter = function(weekNumber) {
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
|
|
||||||
<div class="sg-draggable-calendar-block"/>
|
<div class="sg-draggable-calendar-block"/>
|
||||||
*/
|
*/
|
||||||
sgDraggableCalendarBlock.$inject = ['$rootScope', '$timeout', '$log', 'Calendar', 'CalendarSettings', 'Component'];
|
sgDraggableCalendarBlock.$inject = ['$rootScope', '$timeout', '$log', 'Preferences', 'Calendar', 'CalendarSettings', 'Component'];
|
||||||
function sgDraggableCalendarBlock($rootScope, $timeout, $log, Calendar, CalendarSettings, Component) {
|
function sgDraggableCalendarBlock($rootScope, $timeout, $log, Preferences, Calendar, CalendarSettings, Component) {
|
||||||
return {
|
return {
|
||||||
restrict: 'CA',
|
restrict: 'CA',
|
||||||
require: '^sgCalendarDay',
|
require: '^sgCalendarDay',
|
||||||
|
@ -127,9 +127,7 @@
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
// Create new component from dragging
|
// Create new component from dragging
|
||||||
startDate = new Date(calendarDayCtrl.dayString.substring(0,10) +
|
startDate = calendarDayCtrl.dayString.parseDate(Preferences.$mdDateLocaleProvider, '%Y-%m-%e');
|
||||||
' ' +
|
|
||||||
calendarDayCtrl.dayString.substring(11,16));
|
|
||||||
newData = {
|
newData = {
|
||||||
type: 'appointment',
|
type: 'appointment',
|
||||||
pid: calendarData? calendarData.pid : Calendar.$defaultCalendar(),
|
pid: calendarData? calendarData.pid : Calendar.$defaultCalendar(),
|
||||||
|
|
Loading…
Reference in a new issue