Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.

Optimize timestamp retrieval for modern browsers with backwards compatibility #2168

Merged
merged 1 commit into from
Mar 27, 2013
Merged

Optimize timestamp retrieval for modern browsers with backwards compatibility #2168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions js/jquery.fileupload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
],

_BitrateTimer: function () {
this.timestamp = (new Date()).getTime();
this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
this.loaded = 0;
this.bitrate = 0;
this.getBitrate = function (now, loaded, interval) {
Expand Down Expand Up @@ -289,7 +289,7 @@

_onProgress: function (e, data) {
if (e.lengthComputable) {
var now = (new Date()).getTime(),
var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
loaded;
if (data._time && data.progressInterval &&
(now - data._time < data.progressInterval) &&
Expand Down