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

This commit is contained in:
Manuel Friedli 2013-11-26 19:13:53 +01:00
commit 1cf8924311
2 changed files with 2 additions and 2 deletions

View file

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

2
uhr.js
View file

@ -89,7 +89,7 @@ Uhr.prototype.update = function() {
} }
} }
Uhr.prototype.clear = function() { Uhr.prototype.clear = function() {
this.renderarea.find('.item').removeClass('active'); this.renderarea.parent().find('.item').removeClass('active');
} }
Uhr.prototype.highlight = function(itemClass) { Uhr.prototype.highlight = function(itemClass) {
this.renderarea.parent().find('.item.' + itemClass).addClass('active'); this.renderarea.parent().find('.item.' + itemClass).addClass('active');