Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
84e12bdf
Commit
84e12bdf
authored
Oct 03, 2014
by
Waheed Ahmed
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5479 from edx/waheed/tnl157-fix-incorrect-relative-time
Fixed incorrect relative time value.
parents
536a815a
3bfe09b8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
common/lib/xmodule/xmodule/js/spec/time_spec.js
+1
-1
common/lib/xmodule/xmodule/js/src/time.js
+1
-1
No files found.
common/lib/xmodule/xmodule/js/spec/time_spec.js
View file @
84e12bdf
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
[
488
,
'00:08:08'
],
[
2452
,
'00:40:52'
],
[
488
,
'00:08:08'
],
[
2452
,
'00:40:52'
],
[
3600
,
'01:00:00'
],
[
28800
,
'08:00:00'
],
[
3600
,
'01:00:00'
],
[
28800
,
'08:00:00'
],
[
144532
,
'40:08:52'
],
[
190360
,
'52:52:40'
],
[
144532
,
'40:08:52'
],
[
190360
,
'52:52:40'
],
[
294008
,
'81:40:08'
]
[
294008
,
'81:40:08'
]
,
[
-
5
,
'00:00:00'
]
];
];
$
.
each
(
testTimes
,
function
(
index
,
times
)
{
$
.
each
(
testTimes
,
function
(
index
,
times
)
{
...
...
common/lib/xmodule/xmodule/js/src/time.js
View file @
84e12bdf
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
function
format
(
time
,
formatFull
)
{
function
format
(
time
,
formatFull
)
{
var
hours
,
minutes
,
seconds
;
var
hours
,
minutes
,
seconds
;
if
(
!
_
.
isFinite
(
time
))
{
if
(
!
_
.
isFinite
(
time
)
||
time
<
0
)
{
time
=
0
;
time
=
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment