diff --git a/css/main.css b/css/main.css index 61b7d5c1..86a00c83 100644 --- a/css/main.css +++ b/css/main.css @@ -110,10 +110,6 @@ html { color: #aaa; } -.hidden { - display: none; -} - .light { font-family: "HelveticaNeue-UltraLight", sans-serif; } diff --git a/index.php b/index.php index 8ebc134e..89a5389d 100644 --- a/index.php +++ b/index.php @@ -14,7 +14,7 @@
-
+
diff --git a/js/time/time.js b/js/time/time.js index a38d5511..311f7b51 100644 --- a/js/time/time.js +++ b/js/time/time.js @@ -10,27 +10,26 @@ var time = { * Updates the time that is shown on the screen */ time.updateTime = function () { - - var _now = moment(), - _date = _now.format('[]dddd,[]LL[]'); + var timeLocation = this.timeLocation; + var _now = moment(); + var _date = _now.format('[]dddd,[ ]LL[]'); - $(this.dateLocation).updateWithText(_date, 1000); $('.fade').removeClass('fade') - $('#timebuffer').html(_now.format('HH:mm').replace(/./g, "$&")); - $('#timebuffer').children().each(function( index ) { + var diff = $('
').html(_now.format(this._timeFormat+':mm').replace(/./g, "$&")); + diff.children().each(function( index ) { var _text = $( this ).text(); var _i = index+1; - var _text2 = $('#time span:nth-child('+_i+')').text(); + var _text2 = $(timeLocation + ' span:nth-child('+_i+')').text(); if (_text != _text2) { - $('#time span:nth-child('+_i+')').addClass('fade'); + $(timeLocation +' span:nth-child('+_i+')').addClass('fade'); $(this).addClass('fade'); } }); $('.fade').fadeTo(400, 0.25, function() { - $('#time').html($('#timebuffer').html()); - $('#time').children().fadeTo(400, 1).removeClass('fade'); - }); + $(timeLocation).html(diff.html()); + $(timeLocation).children().fadeTo(400, 1).removeClass('fade'); + }).bind(this); } @@ -41,6 +40,7 @@ time.init = function () { } else { time._timeFormat = 'HH'; } + $(this.timeLocation).html(''); this.intervalId = setInterval(function () { this.updateTime();