Commit 8423a427 authored by Leo Iannacone's avatar Leo Iannacone

Merge branch 'master' into portable

parents f7a4f04a 39f92062
{
"globals": {
"$": false,
"console": false,
"config": false,
"Utils": false,
"debug_socket": false
},
"globalstrict": true,
"browser": true
}
......@@ -62,7 +62,7 @@ config.web.preferences.debug = 0; // debug level - 0 means disabled
// DO NOT TOUCH these ones
config.version = '0.2.3';
config.version = '0.2.4';
// A simple function to quickly have
// get and set strings for client events
......
......@@ -23,7 +23,7 @@ var debug = function () {
else
console.log.apply(console, arguments);
}
}
};
/*
An helper debug function for socket events
......@@ -38,4 +38,4 @@ var debug_socket = function () {
if (arguments[0] == "received")
level = 4;
debug(level, "socket", arguments[0], "event:", arguments[1], "data:", arguments[2]);
}
};
......@@ -11,14 +11,14 @@ function Page_Generic() {
}
function __get_status_html_href(status_data) {
result = config.paths.distribution + '#' + status_data.distribution;
var result = config.paths.distribution + '#' + status_data.distribution;
if (status_data.hasOwnProperty('package'))
result += '/' + status_data.package.replace('_', '/') + '/datestamp';
return result;
}
function __get_status_html_title(status_data) {
result = status_data.status + ': ' + status_data.distribution;
var result = status_data.status + ': ' + status_data.distribution;
if (status_data.hasOwnProperty('package'))
result += ' > ' + status_data.package;
if (status_data.hasOwnProperty('uploader') && status_data.uploader.length > 0)
......@@ -69,20 +69,20 @@ function Page_Generic() {
}
}
},
}
};
var status = {
set: function (data_status) {
$("#status ul").html('');
$('#status ul').html('');
if (data_status.length > 0) {
data_status.forEach(function (s) {
status.append(s);
})
});
}
},
append: function (status_data) {
$('#status .idle').hide();
$("#status ul").append(__get_status_html(status_data));
$('#status ul').append(__get_status_html(status_data));
},
update: function (status_data) {
......
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