Skip to content

Commit 8b46603

Browse files
committed
Merge pull request blueimp#2168 from cflynn07/master
Optimize timestamp retrieval for modern browsers with backwards compatibility
2 parents 57d2292 + 357b8c3 commit 8b46603

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

js/jquery.fileupload.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
],
216216

217217
_BitrateTimer: function () {
218-
this.timestamp = (new Date()).getTime();
218+
this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
219219
this.loaded = 0;
220220
this.bitrate = 0;
221221
this.getBitrate = function (now, loaded, interval) {
@@ -289,7 +289,7 @@
289289

290290
_onProgress: function (e, data) {
291291
if (e.lengthComputable) {
292-
var now = (new Date()).getTime(),
292+
var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
293293
loaded;
294294
if (data._time && data.progressInterval &&
295295
(now - data._time < data.progressInterval) &&

0 commit comments

Comments
 (0)