Merge branch 'master' into new-map-data

This commit is contained in:
Jon Atkins
2013-08-28 00:50:58 +01:00
8 changed files with 49 additions and 5 deletions

View File

@ -444,6 +444,7 @@ function boot() {
shadowSize: new L.Point(41, 41)
}});
window.setupIdle();
window.setupTaphold();
window.setupStyles();
window.setupDialogs();

View File

@ -44,8 +44,11 @@ var idleMouseMove = function(e) {
}
}
$('body').keypress(idleReset);
$('body').mousemove(idleMouseMove);
window.setupIdle = function() {
$('body').keypress(idleReset);
$('body').mousemove(idleMouseMove);
}
window.isIdle = function() {
return window.idleTime >= window._idleTimeLimit;