From 7252055e4ae2a7bfce7a5587ba03915cfd6724b3 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 23 Nov 2017 16:49:19 +0100 Subject: [PATCH] Markdown: Convert Markdown via Jinja filter in the template This gets rid of the use of javascript for converting node/post description. Now we only use markdown.js for real time as-we-type stuff, like node/post editing or commenting. --- src/templates/nodes/custom/_scripts.pug | 12 ------------ src/templates/nodes/custom/asset/file/view_embed.pug | 2 +- .../nodes/custom/asset/image/view_embed.pug | 2 +- .../nodes/custom/asset/video/view_embed.pug | 2 +- src/templates/nodes/custom/blog/_macros.pug | 2 +- src/templates/nodes/custom/group/view_embed.pug | 2 +- src/templates/nodes/custom/group_hdri/view_embed.pug | 2 +- .../nodes/custom/group_texture/view_embed.pug | 2 +- src/templates/nodes/custom/hdri/view_embed.pug | 2 +- src/templates/nodes/custom/page/view_embed.pug | 4 ++-- src/templates/projects/view_embed.pug | 2 +- 11 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/templates/nodes/custom/_scripts.pug b/src/templates/nodes/custom/_scripts.pug index 437ed567..8b010ba0 100644 --- a/src/templates/nodes/custom/_scripts.pug +++ b/src/templates/nodes/custom/_scripts.pug @@ -1,17 +1,5 @@ script(type="text/javascript"). - /* Convert Markdown */ - var convert_fields = '.node-details-description, .blog_index-item .item-content'; - var convert = new Markdown.getSanitizingConverter(); - Markdown.Extra.init(convert); - convert = convert.makeHtml; - - - /* Parse description/content fields to convert markdown */ - $(convert_fields).each(function(i){ - $(convert_fields).eq(i).html(convert($(convert_fields).eq(i).text())); - }); - ProjectUtils.setProjectAttributes({isProject: false}); // Click anywhere in the page to hide the overlay diff --git a/src/templates/nodes/custom/asset/file/view_embed.pug b/src/templates/nodes/custom/asset/file/view_embed.pug index 72a56321..1100ae57 100644 --- a/src/templates/nodes/custom/asset/file/view_embed.pug +++ b/src/templates/nodes/custom/asset/file/view_embed.pug @@ -18,7 +18,7 @@ | {% if node.description %} .node-details-description#node-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} include ../../_node_details diff --git a/src/templates/nodes/custom/asset/image/view_embed.pug b/src/templates/nodes/custom/asset/image/view_embed.pug index d92b5392..ccb6cb53 100644 --- a/src/templates/nodes/custom/asset/image/view_embed.pug +++ b/src/templates/nodes/custom/asset/image/view_embed.pug @@ -18,7 +18,7 @@ | {% if node.description %} .node-details-description#node-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} include ../../_node_details diff --git a/src/templates/nodes/custom/asset/video/view_embed.pug b/src/templates/nodes/custom/asset/video/view_embed.pug index 2e192957..528ef3b5 100644 --- a/src/templates/nodes/custom/asset/video/view_embed.pug +++ b/src/templates/nodes/custom/asset/video/view_embed.pug @@ -40,7 +40,7 @@ | {% if node.description %} .node-details-description#node-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} include ../../_node_details diff --git a/src/templates/nodes/custom/blog/_macros.pug b/src/templates/nodes/custom/blog/_macros.pug index 78f585cc..e583186d 100644 --- a/src/templates/nodes/custom/blog/_macros.pug +++ b/src/templates/nodes/custom/blog/_macros.pug @@ -25,7 +25,7 @@ a.blog_index-header(href="{{ node.url }}") | {{ node.name }} .item-content - | {{ node.properties.content }} + | {{ node.properties.content | markdown }} | {% endmacro %} diff --git a/src/templates/nodes/custom/group/view_embed.pug b/src/templates/nodes/custom/group/view_embed.pug index 1507e8fd..a39b62e1 100644 --- a/src/templates/nodes/custom/group/view_embed.pug +++ b/src/templates/nodes/custom/group/view_embed.pug @@ -15,7 +15,7 @@ | {% if node.description %} .node-details-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} section.node-children.group diff --git a/src/templates/nodes/custom/group_hdri/view_embed.pug b/src/templates/nodes/custom/group_hdri/view_embed.pug index ab2abe2d..bf2f4239 100644 --- a/src/templates/nodes/custom/group_hdri/view_embed.pug +++ b/src/templates/nodes/custom/group_hdri/view_embed.pug @@ -12,7 +12,7 @@ | {% if node.description %} section.node-row .node-details-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} | {% if children %} diff --git a/src/templates/nodes/custom/group_texture/view_embed.pug b/src/templates/nodes/custom/group_texture/view_embed.pug index d9900830..a52e7bd8 100644 --- a/src/templates/nodes/custom/group_texture/view_embed.pug +++ b/src/templates/nodes/custom/group_texture/view_embed.pug @@ -12,7 +12,7 @@ | {% if node.description %} section.node-row .node-details-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} | {% if children %} diff --git a/src/templates/nodes/custom/hdri/view_embed.pug b/src/templates/nodes/custom/hdri/view_embed.pug index db73f3d9..9a6f02ff 100644 --- a/src/templates/nodes/custom/hdri/view_embed.pug +++ b/src/templates/nodes/custom/hdri/view_embed.pug @@ -93,7 +93,7 @@ | {% if node.description %} .node-details-description#node-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} | {% if node.properties.license_notes %} diff --git a/src/templates/nodes/custom/page/view_embed.pug b/src/templates/nodes/custom/page/view_embed.pug index 3709a03d..1f11571b 100644 --- a/src/templates/nodes/custom/page/view_embed.pug +++ b/src/templates/nodes/custom/page/view_embed.pug @@ -17,7 +17,7 @@ | {% if node.description %} .node-details-description#node-description - | {{node.description}} + | {{ node.description | markdown }} | {% endif %} .node-details-meta.footer @@ -32,7 +32,7 @@ script. // Push the correct URL onto the history. This push happens after the id has // been pushed to the history already. We should probably keep only this and // skip the project-level displayNode push. - + var url = '{{ node.properties.url }}' var replace_state = {nodeId: '{{node._id}}', url: url}; window.history.replaceState( diff --git a/src/templates/projects/view_embed.pug b/src/templates/projects/view_embed.pug index 0b6ddb03..6ba828f5 100644 --- a/src/templates/projects/view_embed.pug +++ b/src/templates/projects/view_embed.pug @@ -39,7 +39,7 @@ | {% if project.description %} .node-details-description - | {{ project.description }} + | {{ project.description | markdown }} | {% endif %} | {# Until we implement urls for pages