LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

(js) Fix date parsing on Safari

Browse source
This commit is contained in:
Francis Lachapelle 2016-01-26 07:20:02 -05:00
parent 53b2e19fee
commit 8a177bea47
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
UI/WebServerResources/js/Preferences/Preferences.service.js
View file

@ -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) {

8
UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
View file

@ -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(),