Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11004 from edx/ibrahimahmed443/SOL-1479-change-time-allotment

Browse Source 
Ibrahimahmed443/sol 1479 change time allotment
This commit is contained in:
Ibrahim Ahmed
2015-12-21 21:55:30 +05:00
parent 42de6ffa96 f3d43ab5db
commit 5832b579be
4 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/static/js/vendor/timepicker/jquery.timepicker.js vendored
View File

@@ -304,9 +304,8 @@ requires jQuery 1.7+
// make sure the end time is greater than start time, otherwise there will be no list to show
end += _ONE_DAY;
}
for (var i=start; i <= end; i += settings.step*60) {
var timeInt = i%_ONE_DAY;
var timeInt = i;
var row = $('<li />');
row.data('time', timeInt);
row.text(_int2time(timeInt, settings.timeFormat));
@@ -609,6 +608,8 @@ requires jQuery 1.7+
case 'H':
hour = time.getHours();
if (seconds >= _ONE_DAY)
hour = Math.floor(seconds / (60 * 60));
output += (hour > 9) ? hour : '0'+hour;
break;