Merge pull request #658 from donejs/line-highlight

Move line highlighting into last document ready callback
donejs · May 2, 2016 · 852918d · 852918d
2 parents 611b48f + acf3570
commit 852918d
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 37 deletions.
diff --git a/docs/theme/static/js/line-highlight.js b/docs/theme/static/js/line-highlight.js
@@ -27,50 +27,48 @@ var getLines = function (lineString) {
 };
 
 module.exports = function() {
-  $(function() {
-    $('span[line-highlight]').each(function(i, el){
-      var $el = $(el);
-      var lines = getLines($el.attr('line-highlight'));
-      var codeBlock = $el.parent().prev('pre').children('code');
+  $('span[line-highlight]').each(function(i, el){
+    var $el = $(el);
+    var lines = getLines($el.attr('line-highlight'));
+    var codeBlock = $el.parent().prev('pre').children('code');
 
-      var lineMap = { 0: [] };
-      var k = 0;
+    var lineMap = { 0: [] };
+    var k = 0;
 
-      codeBlock.children().each(function(i, el){
-        var nodeText = $(el).text();
+    codeBlock.children().each(function(i, el){
+      var nodeText = $(el).text();
 
-        if (/\n/gm.test(nodeText)) {
-          var cNames = $(el).attr('class');
-          var str = nodeText.split('\n');
-          var l = str.length
+      if (/\n/gm.test(nodeText)) {
+        var cNames = $(el).attr('class');
+        var str = nodeText.split('\n');
+        var l = str.length
 
-          for (var j = 0; j < l; j++) {
-            var text = j === (l - 1) ? str[j] : str[j] + '\n';
-            var newNode = document.createElement('span');
-            newNode.className = cNames;
-            $(newNode).text(text);
-            lineMap[k].push(newNode);
-
-            if(j !== (l - 1)) {
-              k++;
-              lineMap[k] = [];
-            }
+        for (var j = 0; j < l; j++) {
+          var text = j === (l - 1) ? str[j] : str[j] + '\n';
+          var newNode = document.createElement('span');
+          newNode.className = cNames;
+          $(newNode).text(text);
+          lineMap[k].push(newNode);
+
+          if(j !== (l - 1)) {
+            k++;
+            lineMap[k] = [];
           }
-        } else {
-          lineMap[k].push(el);
         }
-      });
+      } else {
+        lineMap[k].push(el);
+      }
+    });
 
-      codeBlock.empty();
+    codeBlock.empty();
 
-      for (var key in lineMap) {
-         if (lineMap.hasOwnProperty(key)) {
-            var newNode = document.createElement('span');
-            newNode.className = lines[key] ? 'line highlight': 'line' ;
-            $(newNode).append(lineMap[key]);
-            codeBlock.append(newNode);
-         }
+    for (var key in lineMap) {
+       if (lineMap.hasOwnProperty(key)) {
+          var newNode = document.createElement('span');
+          newNode.className = lines[key] ? 'line highlight': 'line' ;
+          $(newNode).append(lineMap[key]);
+          codeBlock.append(newNode);
        }
-    });
+     }
   });
 }
diff --git a/docs/theme/static/static.js b/docs/theme/static/static.js
@@ -22,7 +22,6 @@ steal(
             }
         }
         prettyPrint();
-        Highlighter();
 
         new ContentList(".contents");
         new FrameHelper(".docs");
@@ -563,6 +562,8 @@ steal(
                     }
                 });
             }
+
+            Highlighter();
         })