Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions"
This reverts commit8c0098812d, reversing changes made to5b6e2dd5ee.
This commit is contained in:
@@ -4,19 +4,24 @@
|
||||
'underscore',
|
||||
'backbone',
|
||||
'gettext',
|
||||
'edx-ui-toolkit/js/utils/date-utils'
|
||||
], function($, _, Backbone, gettext, DateUtils) {
|
||||
'date'
|
||||
], function($, _, Backbone, gettext, Date) {
|
||||
'use strict';
|
||||
|
||||
function formatDate(date, userLanguage, userTimezone) {
|
||||
var context;
|
||||
context = {
|
||||
datetime: date,
|
||||
language: userLanguage,
|
||||
timezone: userTimezone,
|
||||
format: DateUtils.dateFormatEnum.shortDate
|
||||
};
|
||||
return DateUtils.localize(context);
|
||||
function formatDate(date) {
|
||||
return dateUTC(date).toString('MMM dd, yyyy');
|
||||
}
|
||||
|
||||
// Return a date object using UTC time instead of local time
|
||||
function dateUTC(date) {
|
||||
return new Date(
|
||||
date.getUTCFullYear(),
|
||||
date.getUTCMonth(),
|
||||
date.getUTCDate(),
|
||||
date.getUTCHours(),
|
||||
date.getUTCMinutes(),
|
||||
date.getUTCSeconds()
|
||||
);
|
||||
}
|
||||
|
||||
return Backbone.View.extend({
|
||||
@@ -31,26 +36,8 @@
|
||||
|
||||
render: function() {
|
||||
var data = _.clone(this.model.attributes);
|
||||
var userLanguage = '',
|
||||
userTimezone = '';
|
||||
if (this.model.userPreferences !== undefined) {
|
||||
userLanguage = this.model.userPreferences.userLanguage;
|
||||
userTimezone = this.model.userPreferences.userTimezone;
|
||||
}
|
||||
if (data.advertised_start !== undefined) {
|
||||
data.start = data.advertised_start;
|
||||
} else {
|
||||
data.start = formatDate(
|
||||
new Date(data.start),
|
||||
userLanguage,
|
||||
userTimezone
|
||||
);
|
||||
}
|
||||
data.enrollment_start = formatDate(
|
||||
new Date(data.enrollment_start),
|
||||
userLanguage,
|
||||
userTimezone
|
||||
);
|
||||
data.start = formatDate(new Date(data.start));
|
||||
data.enrollment_start = formatDate(new Date(data.enrollment_start));
|
||||
this.$el.html(this.tpl(data));
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -31,15 +31,12 @@
|
||||
},
|
||||
|
||||
renderItems: function() {
|
||||
/* eslint no-param-reassign: [2, { "props": true }] */
|
||||
var latest = this.model.latest();
|
||||
var items = latest.map(function(result) {
|
||||
result.userPreferences = this.model.userPreferences;
|
||||
var item = new CourseCardView({model: result});
|
||||
return item.render().el;
|
||||
}, this);
|
||||
this.$list.append(items);
|
||||
/* eslint no-param-reassign: [2, { "props": false }] */
|
||||
},
|
||||
|
||||
attachScrollHandler: function() {
|
||||
|
||||
Reference in New Issue
Block a user