deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switching to using moment.js for times in JS, rather than a custom solution. Fixes #688

Browse source
This commit is contained in:
Dan Cryer 2014-12-07 11:51:41 +00:00
commit 3db08c7315
6 changed files with 27 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/assets/js/build-plugins/time.js
View file

@ -14,15 +14,15 @@ var timePlugin = ActiveBuild.UiPlugin.extend({
var finished = '';
if (ActiveBuild.buildData.created) {
created = dateFormat(ActiveBuild.buildData.created);
created = moment(ActiveBuild.buildData.created).format('ll LT');
}
if (ActiveBuild.buildData.started) {
started = dateFormat(ActiveBuild.buildData.started);
started = moment(ActiveBuild.buildData.started).format('ll LT');
}
if (ActiveBuild.buildData.finished) {
finished = dateFormat(ActiveBuild.buildData.finished);
finished = moment(ActiveBuild.buildData.finished).format('ll LT');
}
return '<table class="table table-striped table-bordered">' +
@ -51,15 +51,15 @@ var timePlugin = ActiveBuild.UiPlugin.extend({
var finished = '';
if (build.created) {
created = dateFormat(build.created);
created = moment(build.created).format('ll LT');
}
if (build.started) {
started = dateFormat(build.started);
started = moment(build.started).format('ll LT');
}
if (build.finished) {
finished = dateFormat(build.finished);
finished = moment(build.finished).format('ll LT');
}
$('#created').text(created);

10
public/assets/js/moment.min.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

71
public/assets/js/phpci.js
View file

@ -407,73 +407,6 @@ function setupProjectForm()
});
}
function dateFormat(date)
{
if (typeof date == 'string') {
date = new Date(date);
}
var rtn = '';
switch (date.getMonth()) {
case 0:
rtn = 'Jan ';
break;
case 1:
rtn = 'Feb ';
break;
case 2:
rtn = 'Mar ';
break;
case 3:
rtn = 'Apr ';
break;
case 4:
rtn = 'May ';
break;
case 5:
rtn = 'Jun ';
break;
case 6:
rtn = 'Jul ';
break;
case 7:
rtn = 'Aug ';
break;
case 8:
rtn = 'Sep ';
break;
case 9:
rtn = 'Oct ';
break;
case 10:
rtn = 'Nov ';
break;
case 11:
rtn = 'Dec ';
break;
}
rtn += date.getDate() + ' ' + date.getFullYear();
rtn += ' ' + date.getHours() + ':' + date.getMinutes();
return rtn;
}
var Lang = {
get: function () {
var args = Array.prototype.slice.call(arguments);;
@ -486,4 +419,6 @@ var Lang = {
return 'MISSING: ' + string;
}
};
};
moment.locale(PHPCI_LANGUAGE);