Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhrmodul
This commit is contained in:
		
						commit
						5708fd52f5
					
				
					 2 changed files with 9 additions and 2 deletions
				
			
		|  | @ -1,5 +1,5 @@ | ||||||
| CACHE MANIFEST | CACHE MANIFEST | ||||||
| # 2.3 | # 2.3.1 | ||||||
| 
 | 
 | ||||||
| COPYING | COPYING | ||||||
| index.html | index.html | ||||||
|  |  | ||||||
|  | @ -25,6 +25,13 @@ var layout = { | ||||||
| 		[h('E', 8), h('I', 8),h('G', 8),h('H', 8),h('T', 8),h('E', 11),h('L', 11),h('E', 11),h('V', 11),h('E', 11),h('N', 11)], | 		[h('E', 8), h('I', 8),h('G', 8),h('H', 8),h('T', 8),h('E', 11),h('L', 11),h('E', 11),h('V', 11),h('E', 11),h('N', 11)], | ||||||
| 		[h('S', 7), h('E', 7),h('V', 7),h('E', 7),h('N', 7),h('T', 12),h('W', 12),h('E', 12),h('L', 12),h('V', 12),h('E', 12)], | 		[h('S', 7), h('E', 7),h('V', 7),h('E', 7),h('N', 7),h('T', 12),h('W', 12),h('E', 12),h('L', 12),h('V', 12),h('E', 12)], | ||||||
| 		[h('T', 10), h('E', 10),h('N', 10),l('S'),l('E'),l('O', 'sharphour'),l('C', 'sharphour'),l('L', 'sharphour'),l('O', 'sharphour'),l('C', 'sharphour'),l('K', 'sharphour')] | 		[h('T', 10), h('E', 10),h('N', 10),l('S'),l('E'),l('O', 'sharphour'),l('C', 'sharphour'),l('L', 'sharphour'),l('O', 'sharphour'),l('C', 'sharphour'),l('K', 'sharphour')] | ||||||
| 	] | 	], | ||||||
|  | 	getHour: function(date) { | ||||||
|  | 		var hour = date.getHours(); | ||||||
|  | 		if (date.getMinutes() >= 35) { | ||||||
|  | 			return hour + 1; | ||||||
|  | 		} | ||||||
|  | 		return hour; | ||||||
|  | 	} | ||||||
| }; | }; | ||||||
| uhr.register('en', layout); | uhr.register('en', layout); | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue