mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 14:27:22 +01:00
MDL-68200 core: Support fixday/hour for core/user_date's get() method
This commit is contained in:
parent
558470e7c1
commit
e21252b309
2
lib/amd/build/user_date.min.js
vendored
2
lib/amd/build/user_date.min.js
vendored
@ -1,2 +1,2 @@
|
||||
define ("core/user_date",["jquery","core/ajax","core/sessionstorage","core/config"],function(a,b,c,d){var e={},f=function(b){var c=a("html").attr("lang").replace(/-/g,"_");return"core_user_date/"+c+"/"+d.usertimezone+"/"+b.timestamp+"/"+b.format},g=function(a){return c.get(a)},h=function(a,b){c.set(a,b)},i=function(a){return"undefined"!=typeof e[a]},j=function(a){return e[a]},k=function(a,b){e[a]=b},l=function(a){var c=a.map(function(a){return{timestamp:a.timestamp,format:a.format,type:a.type||""}}),e={methodname:"core_get_user_dates",args:{contextid:d.contextid,timestamps:c}};return b.call([e],!0,!0)[0].then(function(b){b.dates.forEach(function(b,c){var d=a[c],e=f(d);h(e,b);d.deferred.resolve(b)})}).catch(function(b){a.forEach(function(a){a.deferred.reject(b)})})};return{get:function get(b){var c=[],d=[];b.forEach(function(b){var e=f(b);if(i(e)){d.push(j(e))}else{var h=a.Deferred(),l=g(e);if(l){h.resolve(l)}else{b.deferred=h;c.push(b)}k(e,h.promise());d.push(h.promise())}});if(c.length){l(c)}return a.when.apply(a,d).then(function(){return 1===arguments.length?[arguments[0]]:Array.apply(null,arguments)})},getUserMidnightForTimestamp:function getUserMidnightForTimestamp(a,b){var c=a>b,d=Math.abs(a-b),e=c?Math.floor(d/86400):Math.ceil(d/86400),f=e*86400,g=c?b+f:b-f;return g}}});
|
||||
define ("core/user_date",["jquery","core/ajax","core/sessionstorage","core/config"],function(a,b,c,d){var e={},f=function(b){var c=a("html").attr("lang").replace(/-/g,"_");return"core_user_date/"+c+"/"+d.usertimezone+"/"+b.timestamp+"/"+b.format},g=function(a){return c.get(a)},h=function(a,b){c.set(a,b)},i=function(a){return"undefined"!=typeof e[a]},j=function(a){return e[a]},k=function(a,b){e[a]=b},l=function(a){var c=a.map(function(a){var b=a.hasOwnProperty("fixday")?a.fixday:1,c=a.hasOwnProperty("fixhour")?a.fixhour:1;return{timestamp:a.timestamp,format:a.format,type:a.type||"",fixday:b,fixhour:c}}),e={methodname:"core_get_user_dates",args:{contextid:d.contextid,timestamps:c}};return b.call([e],!0,!0)[0].then(function(b){b.dates.forEach(function(b,c){var d=a[c],e=f(d);h(e,b);d.deferred.resolve(b)})}).catch(function(b){a.forEach(function(a){a.deferred.reject(b)})})};return{get:function get(b){var c=[],d=[];b.forEach(function(b){var e=f(b);if(i(e)){d.push(j(e))}else{var h=a.Deferred(),l=g(e);if(l){h.resolve(l)}else{b.deferred=h;c.push(b)}k(e,h.promise());d.push(h.promise())}});if(c.length){l(c)}return a.when.apply(a,d).then(function(){return 1===arguments.length?[arguments[0]]:Array.apply(null,arguments)})},getUserMidnightForTimestamp:function getUserMidnightForTimestamp(a,b){var c=a>b,d=Math.abs(a-b),e=c?Math.floor(d/86400):Math.ceil(d/86400),f=e*86400,g=c?b+f:b-f;return g}}});
|
||||
//# sourceMappingURL=user_date.min.js.map
|
||||
|
File diff suppressed because one or more lines are too long
@ -107,10 +107,14 @@ define(['jquery', 'core/ajax', 'core/sessionstorage', 'core/config'],
|
||||
*/
|
||||
var loadDatesFromServer = function(dates) {
|
||||
var args = dates.map(function(data) {
|
||||
var fixDay = data.hasOwnProperty('fixday') ? data.fixday : 1;
|
||||
var fixHour = data.hasOwnProperty('fixhour') ? data.fixhour : 1;
|
||||
return {
|
||||
timestamp: data.timestamp,
|
||||
format: data.format,
|
||||
type: data.type || ''
|
||||
type: data.type || '',
|
||||
fixday: fixDay,
|
||||
fixhour: fixHour
|
||||
};
|
||||
});
|
||||
|
||||
@ -168,7 +172,9 @@ define(['jquery', 'core/ajax', 'core/sessionstorage', 'core/config'],
|
||||
* {
|
||||
* timestamp: 1293876000,
|
||||
* format: '%A, %d %B %Y, %I:%M %p',
|
||||
* type: 'gregorian'
|
||||
* type: 'gregorian',
|
||||
* fixday: false,
|
||||
* fixhour: false
|
||||
* }
|
||||
* ];
|
||||
*
|
||||
|
Loading…
x
Reference in New Issue
Block a user