provide pod lines via data attribute rather than javascript

Author: haarg

root/source.html

@@ -55,7 +55,9 @@
 
 <div class="content">
 <% IF !module.binary %>
-<pre id="source" class="line-numbers"><code class="language-<% filetype %>"><% source %></code></pre>
+<pre id="source" class="line-numbers" data-pod-lines="<%
+  module.pod_lines.map(->(lines){ lines.0+1 _ "-" _ (lines.0+lines.1) }).join(', ')
+%>"><code class="language-<% filetype %>"><% source %></code></pre>
 <% ELSE %>
 This file cannot be displayed inline.  Try the <a href="<% raw_url %>">raw file</a>.
 <% END %>
@@ -67,7 +69,6 @@
 //SyntaxHighlighter.all();
 $(document).ready(function() {
 <% IF module.sloc > 0 %>
-  setPodLines(<% module.pod_lines.json %>);
   togglePod();
 <% END %>
 if(document.location.hash)

root/static/js/syntaxhighlighter.js

@@ -1,4 +1,21 @@
 $(function () {
+    function parseLines (lines) {
+        lines = lines.split(/\s*,\s*/);
+        var all_lines = [];
+        for (var i = 0; i < lines.length; i++) {
+            var line = lines[i];
+            var res = line.match(/^\s*(\d+)\s*(-\s*(\d+)\s*)?$/);
+            if (res) {
+                var start = res[1]*1;
+                var end = (res[3] || res[1])*1;
+                for (var l = start; l <= end; l++) {
+                    all_lines.push(l);
+                }
+            }
+        }
+        return all_lines;
+    }
+
     // Allow tilde in url (#1118). Orig: /\w+:\/\/[\w-.\/?%&=:@;#]*/g,
     SyntaxHighlighter.regexLib['url'] =  /\w+:\/\/[\w-.\/?%&=:@;#~]*/g;
 
@@ -123,39 +140,21 @@ $(function () {
         }
         var lines = pre.attr('data-line');
         if (lines) {
-            lines = lines.split(/,/);
-            var all_lines = [];
-            for (var i = 0; i < lines.length; i++) {
-                var line = lines[i].trim();
-                var res = line.match(/(\d+)-(\d+)/);
-                if (res) {
-                    for (var l = res[1]; l <= res[2]; l++) {
-                        all_lines.push(l);
-                    }
-                }
-                else {
-                    all_lines.push(line);
-                }
-            }
-            config.highlight = all_lines;
+            config.highlight = parseLines(lines);
         }
 
         SyntaxHighlighter.highlight(config, source);
-    });
-});
 
-function setPodLines (lines) {
-    if (!lines || !lines.length) return;
-    for (var i = 0; i < lines.length; i++) {
-        var start = lines[i][0];
-        var length = lines[i][1];
-        var selectors = [];
-        for (var x = start; x < start + length; x++) {
-            selectors.push('.number' + (x+1));
+        var pod_lines = pre.attr('data-pod-lines');
+        if (pod_lines) {
+            var selector = $.map(
+                parseLines(pod_lines),
+                function (e, i) { return '.number' + e }
+            ).join(', ');
+            pre.find('.syntaxhighlighter .line').filter(selector).addClass('pod-line');
         }
-        $('#source .syntaxhighlighter .line').filter(selectors.join(', ')).addClass('pod-line');
-    }
-}
+    });
+});
 
 function togglePod() {
     $('.syntaxhighlighter').toggleClass('pod-hidden');