Fix broken export link if URL does not contain /p/

Fixes #118 Fallback with clientVars.padId does not work at this point, because clientVars is not populated with padId at document.ready state.
ether · Oct 16, 2023 · 78cb07e · 78cb07e
1 parent 8cce6b2
commit 78cb07e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 13 deletions.
diff --git a/ep.json b/ep.json
@@ -5,7 +5,6 @@
       "hooks":{
         "expressCreateServer": "ep_markdown/express",
         "eejsBlock_exportColumn": "ep_markdown/index",
-        "eejsBlock_scripts": "ep_markdown/index",
         "eejsBlock_mySettings": "ep_markdown/index",
         "import": "ep_markdown/index"
       },

diff --git a/index.js b/index.js
@@ -9,10 +9,6 @@ exports.eejsBlock_exportColumn = (hookName, context) => {
   context.content += eejs.require('./templates/exportcolumn.html', {}, module);
 };
 
-exports.eejsBlock_scripts = (hookName, context) => {
-  context.content += eejs.require('./templates/scripts.html', {}, module);
-};
-
 exports.eejsBlock_styles = (hookName, context) => {
   context.content += eejs.require('./templates/styles.html', {}, module);
 };

diff --git a/static/js/main.js b/static/js/main.js
diff --git a/static/js/markdown.js b/static/js/markdown.js
@@ -1,6 +1,10 @@
 'use strict';
 
 exports.postAceInit = (hookName, context) => {
+  const padRootPath = new RegExp(/.*\/p\/[^/]+/)
+      .exec(document.location.pathname) || clientVars.padId;
+  $('#exportmarkdowna').attr('href', `${padRootPath}/export/markdown`);
+
   const enable = () => {
     // add css class markdown
     $('iframe[name="ace_outer"]').contents().find('iframe')

diff --git a/templates/scripts.html b/templates/scripts.html