From e4f5b4193729b2a6bd521455f7d8d45944e7a8ca Mon Sep 17 00:00:00 2001 From: sean kenny Date: Tue, 5 Aug 2014 14:45:04 +0100 Subject: [PATCH] Replacing parseDate --- src/resource/ResourceEventRenderer.js | 2 +- src/resource/ResourceView.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js index 3477335..16ee031 100644 --- a/src/resource/ResourceEventRenderer.js +++ b/src/resource/ResourceEventRenderer.js @@ -411,7 +411,7 @@ function ResourceEventRenderer() { revert = false; var origDate = cellToDate(0, origCell.col); var date = cellToDate(0, cell.col); - dayDelta = dayDiff(date, origDate); + dayDelta = date.diff(origDate, 'days'); if (!cell.row) { // on full-days renderDayOverlay( diff --git a/src/resource/ResourceView.js b/src/resource/ResourceView.js index c0df8a1..8cdff5f 100644 --- a/src/resource/ResourceView.js +++ b/src/resource/ResourceView.js @@ -145,15 +145,15 @@ function ResourceView(element, calendar, viewName) { } } - function updateOptions() { tm = opt('theme') ? 'ui' : 'fc'; rtl = opt('isRTL'); - minMinute = parseTime(opt('minTime')); - maxMinute = parseTime(opt('maxTime')); colFormat = opt('columnFormat'); + minMinute = moment.duration(opt('minTime')); + maxMinute = moment.duration(opt('maxTime')); + // week # options. (TODO: bad, logic also in other views) showWeekNumbers = opt('weekNumbers'); weekNumberTitle = opt('weekNumberTitle');