markdownr 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afce137b9a88a74b444125a02f30a12dba75210bd3e223052542bea4ea39d4bf
-  data.tar.gz: b2cebe87af19b5f2ec26270b6f5b79d05472357e3dcb6916b9047ca69a27a3d5
+  metadata.gz: 49c6809e18e2fe51a4e65446e185529edd529e61bb77e6eea79696b734ebdb8b
+  data.tar.gz: 9d533023489082e69413b4e718c27efa05076f1da863f25d9d68de26bd3ec090
 SHA512:
-  metadata.gz: 94c9857b53bad2ac793ae931607ee74e06f02f2410a029a0cfd5568754daa4befd6d913257ec9fbb673c594b1701ce4a9ef7e2f7681dba7c16f0406e6a8886ea
-  data.tar.gz: b55430f749eadd254de9b2feffd9d9aef09566166d47f33d42be29c58d826955d42a47f7c2fb704ccc807e0748e3b1bfcb7a245c558a38d014acabef2d3894c9
+  metadata.gz: a2602173ee41f8d6034e410a8deba4fb11f5f3149e39c410dbc6366349dc93ba0bec519c6860e4970a7f14ed20dd5f8eeadf03d6452e821993e0d0450bebf19e
+  data.tar.gz: a5dc9a0bb156371fddcbdcdab626ee36b82079a175c56d967f7d4ed1f746d5f191bf709efbb7c0d4cb4f8419d072f51b1d92c8e39e90c8e643c220ebe57d4cbf

data/lib/markdown_server/app.rb

@@ -726,6 +726,23 @@ module MarkdownServer
         info_html + infl_html + usage_html + conc_html
       end
 
+      def inline_directory_html(dir_path, relative_dir)
+        entries = Dir.entries(dir_path).reject { |e| e.start_with?(".") || EXCLUDED.include?(e) }
+        items = entries.map do |name|
+          stat = File.stat(File.join(dir_path, name)) rescue next
+          is_dir = stat.directory?
+          href = "/browse/" + (relative_dir.empty? ? "" : relative_dir + "/") +
+                 encode_path_component(name) + (is_dir ? "/" : "")
+          { name: name, is_dir: is_dir, href: href }
+        end.compact.sort_by { |i| [i[:is_dir] ? 0 : 1, i[:name].downcase] }
+
+        rows = items.map do |i|
+          %(<li><a href="#{h(i[:href])}"><span class="icon">#{icon_for(i[:name], i[:is_dir])}</span> ) +
+          %(#{h(i[:name])}#{i[:is_dir] ? "/" : ""}</a></li>)
+        end.join
+        %(<ul class="dir-listing">#{rows}</ul>)
+      end
+
       def compile_regexes(query)
         words = query.split(/\s+/).reject(&:empty?)
         return nil if words.empty?
@@ -1106,6 +1123,11 @@ module MarkdownServer
         @meta, body = parse_frontmatter(content)
         @current_wiki_dir = File.dirname(real_path)
         @content = render_markdown(body)
+        relative_dir = File.dirname(relative_path)
+        relative_dir = "" if relative_dir == "."
+        listing = -> { inline_directory_html(File.dirname(real_path), relative_dir) }
+        @content.gsub!("<p>{{directory}}</p>") { listing.call }
+        @content.gsub!("<p>{{admin-directory}}</p>") { admin? ? listing.call : "" }
         @toc = extract_toc(@content)
         @has_toc = @toc.length > 1
         erb :markdown

data/lib/markdown_server/version.rb

@@ -1,3 +1,3 @@
 module MarkdownServer
-  VERSION = "0.5.10"
+  VERSION = "0.5.11"
 end

data/views/layout.erb

@@ -1219,6 +1219,7 @@
       var touchStartX = 0;
       var touchStartY = 0;
       var touchCurrentX = 0;
+      var touchStartedOnTable = false;
       var isDragging = false;
 
       function openDrawer() {
@@ -1277,6 +1278,7 @@
         touchStartY = e.touches[0].clientY;
         touchCurrentX = touchStartX;
         isDragging = false;
+        touchStartedOnTable = !!e.target.closest('table');
       }, { passive: true });
 
       document.addEventListener('touchmove', function(e) {
@@ -1315,7 +1317,8 @@
         if (dy > 80) return; // Too vertical
 
         if (!isOpen && dx < -threshold) {
-          // Swipe left — open drawer
+          // Swipe left — open drawer (not when swipe started on a table)
+          if (touchStartedOnTable) return;
           openDrawer();
         } else if (isOpen && dx > threshold) {
           // Swipe right — close drawer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdownr
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - Brian Dunn
@@ -101,8 +101,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/Dockerfile.markdownr
+- bin/build-and-push-to-docker
 - bin/markdownr
-- bin/push-to-docker
 - lib/markdown_server.rb
 - lib/markdown_server/app.rb
 - lib/markdown_server/version.rb