Use more smarts to determine where "less"/"more" goes, so e.g. a <p> followed by a <table> is treated right.

henrik · henrik · commit 13e0d5ade982 · 2008-10-23T11:59:04.000+02:00
diff --git a/example.html b/example.html
@@ -10,7 +10,11 @@
       $('.example').truncate({max_length: 24});
     });
 
-</script>
+  </script>
+  <style type="text/css">
+    table { border-collapse: collapse; }
+    td, th { border: 1px solid #000; }
+  </style>
 </head>
 <body>
   
@@ -45,11 +49,9 @@ <h2>Example 4: Handling tables</h2>
     <p>Hello!</p>
     
     <table>
-      <tr><th>Name</th></tr>
-      <tr><td>Lauren Ipsum</td></tr>
+      <tr><th>Foo</th><th>Bar</th></tr>
+      <tr><td>Lauren</td><td>Ipsum</td></tr>
     </table>
-    
-    <p>Goodbye!</p>
   </div>
 
 </body>
diff --git a/jquery.truncator.js b/jquery.truncator.js
@@ -16,20 +16,15 @@
       if (content_length <= opts.max_length)
         return;  // bail early if not overlong
 
-      var actual_max_length = opts.max_length - opts.more.length - 3;  // 3 for " ()"    
+      var actual_max_length = opts.max_length - opts.more.length - 3;  // 3 for " ()"
       var truncated_node = recursivelyTruncate(this, actual_max_length);
-      var full_node = $(this);
+      var full_node = $(this).hide();
 
       truncated_node.insertAfter(full_node);
-      // This is an ugly approximation for getting the last block tag:
-      // we just pick the last <p> or else the container itself.
-      truncated_node.find('p:last').add(truncated_node).eq(0).
-        append(' (<a href="#show more content">'+opts.more+'</a>)');
-
-      full_node.hide();
-      full_node.find('p:last').add(full_node).eq(0).
-        append(' (<a href="#show less content">'+opts.less+'</a>)');
-
+      
+      findNodeForMore(truncated_node).append(' (<a href="#show more content">'+opts.more+'</a>)');
+      findNodeForLess(full_node).append(' (<a href="#show less content">'+opts.less+'</a>)');
+      
       truncated_node.find('a:last').click(function() {
         truncated_node.hide(); full_node.show(); return false;
       });
@@ -81,5 +76,23 @@
   function squeeze(string) {
     return string.replace(/\s+/g, ' ');
   }
+  
+  // Finds the last, innermost block-level element
+  function findNodeForMore(node) {
+    var $node = $(node);
+    var last_child = $node.children(":last");
+    if (!last_child) return node;
+    var display = last_child.css('display');
+    if (!display || display=='inline') return $node;
+    return findNodeForMore(last_child);
+  };
+
+  // Finds the last child if it's a p; otherwise the parent
+  function findNodeForLess(node) {
+    var $node = $(node);
+    var last_child = $node.children(":last");
+    if (last_child && last_child.is('p')) return last_child;
+    return node;
+  };
 
 })(jQuery);
