Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr

This commit is contained in:
Manuel Friedli 2013-11-26 15:31:11 +01:00
commit 6c00c5eba5
2 changed files with 2 additions and 2 deletions

View file

@ -1,5 +1,5 @@
CACHE MANIFEST
# 2.2
# 2.2.1
index.html
jquery-2.0.3.min.js

2
uhr.js
View file

@ -92,7 +92,7 @@ Uhr.prototype.clear = function() {
this.renderarea.find('.item').removeClass('active');
}
Uhr.prototype.highlight = function(itemClass) {
this.renderarea.find('.item.' + itemClass).addClass('active');
this.renderarea.parent().find('.item.' + itemClass).addClass('active');
}
Uhr.prototype.getHour = function(date) {
if (typeof this.currentLayout.getHour === 'function') {