Merge branch 'feature/multiinclude' of /var/lib/git/repositories/manuel/uhr into develop
This commit is contained in:
		
						commit
						7d548fb4f6
					
				
					 1 changed files with 2 additions and 0 deletions
				
			
		
							
								
								
									
										2
									
								
								uhr.js
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								uhr.js
									
										
									
									
									
								
							|  | @ -17,6 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>. | ||||||
|  * @param clockarea   Das jQuery-gewrappte HTML-Element, auf dem die Uhr angezeigt werden soll. |  * @param clockarea   Das jQuery-gewrappte HTML-Element, auf dem die Uhr angezeigt werden soll. | ||||||
|  * @param themeElement Das HTML-Stylesheet-Tag, das das Theme-CSS referenziert. |  * @param themeElement Das HTML-Stylesheet-Tag, das das Theme-CSS referenziert. | ||||||
|  */ |  */ | ||||||
|  | if (typeof Uhr === 'undefined') { | ||||||
| function Uhr(clockarea, settings) { | function Uhr(clockarea, settings) { | ||||||
| 	this.id = Uhr.id++; | 	this.id = Uhr.id++; | ||||||
| 	this.timer = null; | 	this.timer = null; | ||||||
|  | @ -339,4 +340,5 @@ function m(letter) { | ||||||
| 	} | 	} | ||||||
| 	return l(letter, style); | 	return l(letter, style); | ||||||
| } | } | ||||||
|  | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue