Merge pull request #1068 from ploxiln/admin_counter_graph

nsqadmin: fix: html-escaped large_graph url breaks inside javascript

nsqadmin/.eslintrc

@@ -54,13 +54,11 @@
     "radix": [1],
     "semi": [1, "always"],
     "semi-spacing": [1],
-    "space-after-function-name": [1, "never"],
-    "space-after-keywords": [1, "always"],
+    "keyword-spacing": [1, {"before": true, "after": true}],
     "space-before-blocks": [1, "always"],
     "space-before-function-paren": [1, "never"],
     "space-in-parens": [1, "never"],
     "space-infix-ops": [1],
-    "space-return-throw-case": [1],
     "space-unary-ops": [1],
     "strict": [0],
     "wrap-iife": [1]

nsqadmin/static/js/views/counter.hbs

@@ -203,9 +203,6 @@ body {
 <p class="processed">Messages Processed</p>
 <p class="messagerate"></p>
 {{#if graph_active}}
-    <script type="text/javascript">
-    var LARGE_GRAPH_URL = "{{large_graph "counter" "*" "" "" "message_count"}}";
-    </script>
-    <img id="big_graph" height="500" src=""/>
+    <img id="big_graph" height="500" src="{{large_graph "counter" "*" "" "" "message_count"}}"/>
 {{/if}}
 </div>

nsqadmin/static/js/views/counter.js

@@ -30,6 +30,7 @@ var CounterView = BaseView.extend({
         this.targetPollInterval = 10000;
         this.currentNum = -1;
         this.interval = 100;
+        this.graphUrl = null;
         this.updateStats();
     },
 
@@ -87,7 +88,11 @@ var CounterView = BaseView.extend({
         }.bind(this));
 
         if ($('#big_graph').length) {
-            $('#big_graph').attr('src', LARGE_GRAPH_URL + '&_uniq=' + Math.random() * 1000000);
+            if (!this.graphUrl) {
+                this.graphUrl = $('#big_graph').attr('src');
+            }
+            var uniq = Math.floor(Math.random() * 1000000);
+            $('#big_graph').attr('src', this.graphUrl + '&_uniq=' + uniq);
         }
     },