Merge remote-tracking branch 'github/master' into portable

debomatic-webui/lib/client.js

@@ -44,7 +44,7 @@ function __send_package_files_list(event_name, socket, data) {
 
 function __send_package_status(socket, data, package_data) {
 
-    var event_name = config.events.client.distribution_packages.status;
+    var event_name = config.events.client.distribution_packages_status;
 
     var new_data = {};
     new_data.distribution = data.distribution;

debomatic-webui/lib/config.js

@@ -72,17 +72,17 @@ config.version = '0.4.2';
 config.events = {};
 config.events.error = 'error';
 config.events.broadcast = {};
-config.events.broadcast.distributions = 'distributions';
-config.events.broadcast.status_update = 'status_update';
-config.events.broadcast.status_debomatic = 'status_debomatic';
+config.events.broadcast.distributions = 'b.distributions';
+config.events.broadcast.status_update = 'b.status_update';
+config.events.broadcast.status_debomatic = 'b.status_debomatic';
 
 config.events.client = {};
-config.events.client.distribution_packages = 'distribution_packages';
-config.events.client.distribution_packages.status = 'package_status';
-config.events.client.package_files_list = 'package_files_list';
-config.events.client.file = 'file';
-config.events.client.file_newcontent = 'file_newcontent';
-config.events.client.status = 'status';
+config.events.client.distribution_packages = 'c.distribution_packages';
+config.events.client.distribution_packages_status = 'c.distribution_packages_status';
+config.events.client.package_files_list = 'c.package_files_list';
+config.events.client.file = 'c.file';
+config.events.client.file_newcontent = 'c.file_newcontent';
+config.events.client.status = 'c.status';
 
 // debomatic status according with JSONLogger.py module
 config.status = {};

debomatic-webui/public/javascripts/page_distribution.js

@@ -589,8 +589,8 @@ function Page_Distrubion(socket) {
             packages.set(socket_data);
         });
 
-        socket.on(_e.distribution_packages.status, function (socket_data) {
-            debug_socket('received', _e.distribution_packages, socket_data);
+        socket.on(_e.distribution_packages_status, function (socket_data) {
+            debug_socket('received', _e.distribution_packages_status, socket_data);
             packages.set_status(socket_data);
             sticky.set_status(socket_data);
         });
@@ -648,7 +648,7 @@ function Page_Distrubion(socket) {
         // when page is loaded sidebar has offset().top
         // equals 0. This is because html is loaded on socket
         // events. Sleep a while and call stiky.reset()
-        setTimeout(sticky.r, 500);
+        setTimeout(sticky.reset, 500);
 
         // WORKAROUND:
         // On incoming hundred of lines browser goes crazy.