--- a/client/annotviz/app/js/annotstimeline.js Fri Jan 23 00:02:20 2015 +0100
+++ b/client/annotviz/app/js/annotstimeline.js Fri Jan 23 00:41:35 2015 +0100
@@ -10,6 +10,7 @@
var PIXI = require('pixi');
var Utils = require('./utils.js');
var _ = require('lodash');
+var moment = require('moment');
var defaultOptions = {
logger: undefined,
@@ -247,14 +248,9 @@
};
//TODO use moment.js
- this.updateTime = function(){
- var currentTime = Date.now() + 3600*1000;
+ this.updateTime = function() {
- var nbSec = currentTime / 1000;
- var hours = Math.floor( nbSec / 3600 ) % 24;
- var minutes = Math.floor( nbSec / 60 ) % 60;
- var seconds = Math.floor(nbSec % 60);
- var timeStr = (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes) + ':' + (seconds < 10 ? '0' + seconds : seconds);
+ var timeStr = moment().format("HH:mm:ss");
currentTimeText.setText(timeStr);
};
--- a/client/annotviz/app/js/utils.js Fri Jan 23 00:02:20 2015 +0100
+++ b/client/annotviz/app/js/utils.js Fri Jan 23 00:41:35 2015 +0100
@@ -9,12 +9,10 @@
var PIXI = require('pixi');
var _ = require('lodash');
+var moment = require('moment');
function formatTime (ts) {
- var hours = Math.floor( (ts/1000) / 3600 ) % 24;
- var minutes = Math.floor( (ts/1000) / 60 ) % 60;
- var seconds = Math.floor( (ts/1000) % 60);
- return ((hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes) + ':' + (seconds < 10 ? '0' + seconds : seconds));
+ return moment(ts).format("HH:mm:ss");
}
function colorToHex(c) {
--- a/client/annotviz/bower.json Fri Jan 23 00:02:20 2015 +0100
+++ b/client/annotviz/bower.json Fri Jan 23 00:41:35 2015 +0100
@@ -4,6 +4,7 @@
"dependencies": {
"randomColor": "davidmerfield/randomColor#~0.1.1",
"pixi": "~2.2.3",
- "lodash": "~2.4.1"
+ "lodash": "~2.4.1",
+ "moment": "~2.9.0"
}
}
--- a/client/annotviz/gulp/tasks/browserify.js Fri Jan 23 00:02:20 2015 +0100
+++ b/client/annotviz/gulp/tasks/browserify.js Fri Jan 23 00:41:35 2015 +0100
@@ -16,6 +16,7 @@
.require('./app/lib/pixi/bin/pixi.js', { expose: 'pixi' })
.require('./app/lib/randomColor/randomColor.js', {expose: 'randomColor'})
.require('./app/lib/lodash/dist/lodash.js', {expose: 'lodash'})
+ .require('./app/lib/moment/min/moment-with-locales.js', {expose: 'moment'})
.bundle()
.pipe(source('libs-'+p.name+'.js'))
.pipe(gulp.dest(config.dist + '/js/'));
@@ -28,6 +29,7 @@
.external('pixi')
.external('randomColor')
.external('lodash')
+ .external('moment')
.transform(partialify) // Transform to allow requireing of templates
.bundle()
.pipe(source(p.name+'.js'))