Commit 94c2ad3a authored by Leo Iannacone's avatar Leo Iannacone

Merge branch 'master' into portable

parents e2464a82 ee4d988d
...@@ -7,5 +7,6 @@ ...@@ -7,5 +7,6 @@
"debug_socket": false "debug_socket": false
}, },
"globalstrict": true, "globalstrict": true,
"browser": true "browser": true,
"node": true
} }
...@@ -67,7 +67,7 @@ config.web.preferences.debug = 0; // debug level - 0 means disabled ...@@ -67,7 +67,7 @@ config.web.preferences.debug = 0; // debug level - 0 means disabled
// DO NOT TOUCH these ones // DO NOT TOUCH these ones
config.version = '0.3.0'; config.version = '0.3.1';
// A simple function to quickly have // A simple function to quickly have
// get and set strings for client events // get and set strings for client events
......
...@@ -19,7 +19,7 @@ if (window.location.pathname == '/') { ...@@ -19,7 +19,7 @@ if (window.location.pathname == '/') {
} }
var real_email = $(this).attr('address').replace('AT', '@').replace('DOT', '.').replace(/ /g, ''); var real_email = $(this).attr('address').replace('AT', '@').replace('DOT', '.').replace(/ /g, '');
var label = real_email; var label = real_email;
if (config.debomatic.admin.name && config.debomatic.admin.name != 'Your Name'); if (config.debomatic.admin.name && config.debomatic.admin.name != 'Your Name')
label = config.debomatic.admin.name; label = config.debomatic.admin.name;
real_email = '<a href="mailto:' + real_email + subject + '">' + label + '</a>'; real_email = '<a href="mailto:' + real_email + subject + '">' + label + '</a>';
$(this).html(real_email); $(this).html(real_email);
......
...@@ -107,7 +107,7 @@ function Page_Generic() { ...@@ -107,7 +107,7 @@ function Page_Generic() {
// and show idle label if necessary. // and show idle label if necessary.
setTimeout(function () { setTimeout(function () {
li.remove(); li.remove();
if ($('#status li').length === 0); if ($('#status li').length === 0)
$('#status .idle').show(); $('#status .idle').show();
}, config.status.delay.remove + 2000); // more delay on remove html }, config.status.delay.remove + 2000); // more delay on remove html
}, config.status.delay.remove); }, config.status.delay.remove);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment