Merge branch 'develop' into feature/splashscreen

This commit is contained in:
Manuel Friedli 2014-12-08 00:00:50 +01:00
commit cde3551077
3 changed files with 38 additions and 2 deletions

View file

@ -1 +1 @@
6.7-next 7.0-next

View file

@ -130,9 +130,45 @@
this.timer = null; this.timer = null;
this.currentMinute = -1; this.currentMinute = -1;
var userTime = this.options.time; var userTime = this.options.time;
var hash, params;
if (this.options.time === undefined) { if (this.options.time === undefined) {
this.options.time = new Date(); this.options.time = new Date();
} }
// parse the URL params
hash = window.location.hash;
if (hash !== undefined && typeof hash === 'string' && hash.charAt(0) === '#') {
hash = hash.substring(1);
hash = decodeURIComponent(hash);
params = hash.split('&');
params.forEach(function (element) {
var pair = element.split('=');
var key = pair[0];
var value = pair[1];
switch (key) {
case 'l':
case 'language':
this.options.language = value;
this.options.force = true;
break;
case 't':
case 'theme':
this.options.theme = value;
this.options.force = true;
break;
case 'm':
case 'mode':
this.options.mode = value;
this.options.force = true;
break;
case 's':
case 'status':
this.options.status = value;
this.options.force = true;
break;
}
}.bind(this));
}
// end parse the URL params
setupHTML.bind(this)(); setupHTML.bind(this)();
wireFunctionality.bind(this)(); wireFunctionality.bind(this)();
if (userTime !== undefined) { if (userTime !== undefined) {

View file

@ -1,5 +1,5 @@
CACHE MANIFEST CACHE MANIFEST
# 6.7-next # 7.0-next
css/uhr.css css/uhr.css
css/uhr-black.css css/uhr-black.css