Merge branch 'MDL-70072-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 11 Nov 2020 14:08:07 +0000 (22:08 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 11 Nov 2020 14:08:07 +0000 (22:08 +0800)
lib/amd/build/user_date.min.js
lib/amd/build/user_date.min.js.map
lib/amd/src/user_date.js

index c221d1a..884e803 100644 (file)
Binary files a/lib/amd/build/user_date.min.js and b/lib/amd/build/user_date.min.js differ
index 87973d0..0b1e565 100644 (file)
Binary files a/lib/amd/build/user_date.min.js.map and b/lib/amd/build/user_date.min.js.map differ
index 95efe3d..15c8be7 100644 (file)
@@ -112,7 +112,7 @@ define(['jquery', 'core/ajax', 'core/sessionstorage', 'core/config'],
             return {
                 timestamp: data.timestamp,
                 format: data.format,
-                type: data.type || '',
+                type: data.type || null,
                 fixday: fixDay,
                 fixhour: fixHour
             };