Merge pull request locustio#20 from erlanggakrisnamukti/rizalfr/b_too…

…ltip_overflow set tooltip to not exceeding the chart box
pancaprima · Nov 1, 2017 · ee1d59f · ee1d59f
2 parents 792b161 + bb8c504
commit ee1d59f
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/locust/static/chart.js b/locust/static/chart.js
@@ -33,24 +33,27 @@
                     subtext: this.subtitle,
                     x: 10,
                     y: 10,
-                    padding: [-7,0,0,0]
+                    padding: [-7, 0, 0, 0]
                 },
                 tooltip: {
                     trigger: 'axis',
+                    confine: true,
+                    axisPointer: {
+                        animation: true
+                    },
                     formatter: function (params) {
                         if (!!params && params.length > 0 && !!params[0].value) {
-                            var str = params[0].name;
-                            for (var i=0; i<params.length; i++) {
-                                var param = params[i];
-                                str += '<br><span style="color:' + param.color + ';">' + param.seriesName + ': ' + param.data + '</span>';
+                            let protomatch = /^(https?|http):\/\//;
+                            let str = params[0].name;                            
+                            for (let i = 0; i < params.length; i++) {
+                                let param = params[i];
+                                let seriesNameFiltered = param.seriesName.substring(0, 64).replace(protomatch, "");
+                                str += '<br><span style="color:' + param.color + ';">' + seriesNameFiltered + ': ' + param.data + '</span>';
                             }
                             return str;
                         } else {
                             return "No data";
                         }
-                    },
-                    axisPointer: {
-                        animation: true
                     }
                 },
                 xAxis: {