Skip to content

Commit

Permalink
datetime types received from server extended to: seconds, millisecond…
Browse files Browse the repository at this point in the history
…s and datetime string #308
  • Loading branch information
psolom committed Apr 1, 2018
1 parent 4a77cbe commit c068db5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 deletions.
28 changes: 19 additions & 9 deletions src/js/filemanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -3272,20 +3272,30 @@ $.richFilemanagerPlugin = function(element, pluginOptions)
}
};

// Converts UNIX timestamp to formatted datetime string
var formatTimestamp = function(timestamp) {
// if value doesn't look like timestamp
if (!timestamp || timestamp <= 0) {
return '';
}
// Converts UNIX timestamp to formatted datetime string
var formatTimestamp = function (datetime) {
var isString = typeof datetime === "string";
var isInteger = typeof datetime === "number" && Math.floor(datetime) === datetime;

// invalid argument
if (!(isString || isInteger)) return '';

// value looks like seconds, while Date() accepts milliseconds
if (isInteger && datetime < 10000000000) {
datetime = datetime * 1000
}

var date = new Date();
date.setTime(timestamp * 1000);
var date = new Date(datetime);

// invalid Date() object, display datetime without formatting
if (!(date instanceof Date) || isNaN(date)) {
return datetime;
}

// Timezone support requires "iana-tz-data" package:
// https://github.com/globalizejs/globalize/blob/master/README.md#3-iana-time-zone-data
return globalize.formatDate(date, config.formatter.datetime);
};
};

// Format server-side response single error object
var formatServerError = function(errorObject) {
Expand Down
Loading

0 comments on commit c068db5

Please sign in to comment.