Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
This commit is contained in:
		
						commit
						6c00c5eba5
					
				
					 2 changed files with 2 additions and 2 deletions
				
			
		|  | @ -1,5 +1,5 @@ | ||||||
| CACHE MANIFEST | CACHE MANIFEST | ||||||
| # 2.2 | # 2.2.1 | ||||||
| 
 | 
 | ||||||
| index.html | index.html | ||||||
| jquery-2.0.3.min.js | jquery-2.0.3.min.js | ||||||
|  |  | ||||||
							
								
								
									
										2
									
								
								uhr.js
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								uhr.js
									
										
									
									
									
								
							|  | @ -92,7 +92,7 @@ Uhr.prototype.clear = function() { | ||||||
| 	this.renderarea.find('.item').removeClass('active'); | 	this.renderarea.find('.item').removeClass('active'); | ||||||
| } | } | ||||||
| Uhr.prototype.highlight = function(itemClass) { | 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) { | Uhr.prototype.getHour = function(date) { | ||||||
| 	if (typeof this.currentLayout.getHour === 'function') { | 	if (typeof this.currentLayout.getHour === 'function') { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue