kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-08 16:34:47 +00:00
Code Issues Projects Releases Wiki Activity

Made Seconds optional

Browse Source
This commit is contained in:
Jonathan Vogt 2016-01-29 11:22:48 +01:00
parent ed9f85f705
commit 9560862b42
1 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
js/time/time.js
View File

@ -2,8 +2,10 @@ var time = {
timeFormat: config.time.timeFormat || 24, timeFormat: config.time.timeFormat || 24,
dateLocation: '.date', dateLocation: '.date',
timeLocation: '#time', timeLocation: '#time',
updateInterval: 10000, updateInterval: 1000,
intervalId: null intervalId: undefined,
displaySeconds: (typeof config.time.displaySeconds == 'undefined') ? true : config.time.displaySeconds,
}; };
/** /**
@ -16,21 +18,56 @@ time.updateTime = function () {
$(this.dateLocation).updateWithText(_date, 1000); $(this.dateLocation).updateWithText(_date, 1000);
$('.fade').removeClass('fade') $('.fade').removeClass('fade')
var diff = $('<div>').html(_now.format(this._timeFormat+':mm').replace(/./g, "<span>$&</span>")); var html = ''
diff.children().each(function( index ) { if (this.displaySeconds) {
html = _now.format(this._timeFormat+':mm').replace(/./g, '<span class="digit">$&</span>') +
'<span class="sec">' + _now.format('ss').replace(/./g, '<span class="digit">$&</span>') + '</span>';
if (typeof this.intervalId == 'undefined') {
this.intervalId = setInterval(function () {
this.updateTime();
}.bind(this), this.updateInterval);
}
} else {
html = _now.format(this._timeFormat+':mm').replace(/./g, '<span class="digit">$&</span>');
if (this.intervalId) {
clearInterval(this.intervalId);
this.intervalId = undefined;
}
seconds = 60 - (new Date()).getSeconds();
setTimeout(function () {
this.updateTime();
}.bind(this), seconds*1000);
}
var diff = $('<div>').html(html);
diff.find('.digit').each(function( index ) {
var _text = $( this ).text(); var _text = $( this ).text();
var _i = index+1; var _i = index+1;
var _text2 = $(timeLocation + ' span:nth-child('+_i+')').text(); var liveNode = $(timeLocation).find('.digit')[index]
if (typeof liveNode != 'undefined') {
liveNode = $(liveNode);
var _text2 = liveNode.text();
if (_text != _text2) { if (_text != _text2) {
$(timeLocation +' span:nth-child('+_i+')').addClass('fade');
liveNode.addClass('fade');
$(this).addClass('fade');
}
} else {
$(this).addClass('fade'); $(this).addClass('fade');
} }
}); });
$('.fade').fadeTo(400, 0.25, function() { if ($('.fade').length == 0) {
// Initial Update
$(timeLocation).html(diff.html()); $(timeLocation).html(diff.html());
$(timeLocation).children().fadeTo(400, 1).removeClass('fade'); diff = undefined;
} else {
$('.fade').fadeTo(400, 0.25, function() {
if (typeof diff != 'undefined') {
$(timeLocation).html(diff.html());
diff = undefined;
}
$('.fade').fadeTo(400, 1).removeClass('fade');
}).bind(this); }).bind(this);
}
} }
time.init = function () { time.init = function () {
@ -40,11 +77,6 @@ time.init = function () {
} else { } else {
time._timeFormat = 'HH'; time._timeFormat = 'HH';
} }
$(this.timeLocation).html('<span class="fade"></span>');
this.intervalId = setInterval(function () {
this.updateTime();
}.bind(this), this.updateInterval);
this.updateTime(); this.updateTime();
} }