fix merge errors and reach full jshint compliance

2016-10-04 16:58:10 +02:00
parent a30e17121d
commit dbc8f01b8b
7 changed files with 56 additions and 51 deletions
--- a/www/common/toolbar.js
+++ b/www/common/toolbar.js
@@ -180,9 +180,10 @@ define([
        var lagLight = $('<div>', {
            'class': 'lag'
        });
+        var title;
        if(lag) {
          firstConnection = false;
-          var title = Messages.lag + ' : ' + lag + ' ms\n';
+          title = Messages.lag + ' : ' + lag + ' ms\n';
          if (lag.waiting || lag > 1000) {
            lagLight.addClass('lag-orange');
            title += Messages.orangeLight;