Merge pull request #1703 from ajaxorg/highlighting/mixed

Do not loose currentState if tokenizer uses combination of next and push
2013-12-25 02:03:04 -08:00 · 2013-12-25 02:03:04 -08:00 · 191a79245f
commit 191a79245f
parent 92dba7d44c 6461d62f90
16 changed files with 2182 additions and 90 deletions
--- a/demo/kitchen-sink/docs/ejs.ejs
+++ b/demo/kitchen-sink/docs/ejs.ejs
@ -1 +1,31 @@
-TODO
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Cloud9 Rocks!</title>
+    </head>
+    <body>
+
+    <table class="table">
+        <tr>
+            <th>Name</th>
+            <th>Size</th>
+        </tr>
+        <% if (!isRoot) { %>
+            <tr>
+                <td><a href="..">..</a></td>
+                <td></td></td>
+            </tr>
+        <% } %>
+        <% entries.forEach(function(entry) { %>
+            <tr>
+                <td>
+                    <span class="glyphicon <%= entry.mime == 'directory' ? 'folder': 'file'%>"></span>
+                    <a href="<%= entry.name %>"><%= entry.name %></a>
+                </td>
+                <td><%= entry.size %></td>
+            </tr>
+        <% }) %>
+    </table>
+    
+    </body>
+</html>