ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mismatched date times on assignment details page 

When editing an assignment, if the user's Canvas time
zone is different than their browser's time zone,
the date in the editor field wouldn't match the date
currently set for the assignment.

Change-Id: Ic6ce80af4cd83d6b1ae1f15ef028c3e0625d02ec
Reviewed-on: https://gerrit.instructure.com/3176
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Brian Palmer <brianp@instructure.com>
This commit is contained in:
Brian Whitmer 2011-04-21 13:12:15 -04:00
parent 8c2d97f436
commit 3980f26580
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/javascripts/full_assignment.js
View File

@ -55,7 +55,7 @@ jQuery(function($){
data.due_date = data.due_date_string;
data.due_time = data.due_time_string;
var parsedDate = Date.parse($.trim(data.due_date + " " + data.due_time));
data.due_at = $.parseFromISO(parsedDate && parsedDate.toISOString()).datetime_formatted;
data.due_at = parsedDate && ($.dateString(parsedDate) + " at " + $.timeString(parsedDate));
$form.find("select[name='points_type']").change();
$form.fillFormData(data, {object_name: 'assignment'});
$assignment.find(".description, .edit_full_assignment_link").hide();

3
public/javascripts/instructure_helper.js
View File

@ -1630,6 +1630,9 @@
$.dateString = function(date) {
return (date && (date.toString($.thisYear(date) ? 'MMM d' : 'MMM d, yyyy'))) || "";
};
$.timeString = function(date) {
return (date && date.toString('h:mmtt').toLowerCase()) || "";
};
$.fn.parseFromISO = $.parseFromISO;
$.timeDiff = function(seconds, format) {