Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
This commit is contained in:
commit
495235db99
2 changed files with 3 additions and 1 deletions
|
@ -1,5 +1,5 @@
|
||||||
CACHE MANIFEST
|
CACHE MANIFEST
|
||||||
# 3.0.6
|
# 3.0.7
|
||||||
|
|
||||||
COPYING
|
COPYING
|
||||||
index.html
|
index.html
|
||||||
|
|
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…
Reference in a new issue