archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Markdown: Convert Markdown via Jinja filter in the template

Browse Source 
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.
This commit is contained in:
Pablo Vazquez 2017-11-23 16:49:19 +01:00
parent c086cff36e
commit 7252055e4a
11 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/templates/nodes/custom/_scripts.pug
View File

@ -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

2
src/templates/nodes/custom/asset/file/view_embed.pug
View File

@ -18,7 +18,7 @@
| {% if node.description %}
.node-details-description#node-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
include ../../_node_details

2
src/templates/nodes/custom/asset/image/view_embed.pug
View File

@ -18,7 +18,7 @@
| {% if node.description %}
.node-details-description#node-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
include ../../_node_details

2
src/templates/nodes/custom/asset/video/view_embed.pug
View File

@ -40,7 +40,7 @@
| {% if node.description %}
.node-details-description#node-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
include ../../_node_details

2
src/templates/nodes/custom/blog/_macros.pug
View File

@ -25,7 +25,7 @@ a.blog_index-header(href="{{ node.url }}")
| {{ node.name }}
.item-content
| {{ node.properties.content }}
| {{ node.properties.content | markdown }}
| {% endmacro %}

2
src/templates/nodes/custom/group/view_embed.pug
View File

@ -15,7 +15,7 @@
| {% if node.description %}
.node-details-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
section.node-children.group

2
src/templates/nodes/custom/group_hdri/view_embed.pug
View File

@ -12,7 +12,7 @@
| {% if node.description %}
section.node-row
.node-details-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
| {% if children %}

2
src/templates/nodes/custom/group_texture/view_embed.pug
View File

@ -12,7 +12,7 @@
| {% if node.description %}
section.node-row
.node-details-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
| {% if children %}

2
src/templates/nodes/custom/hdri/view_embed.pug
View File

@ -93,7 +93,7 @@
| {% if node.description %}
.node-details-description#node-description
| {{node.description}}
| {{ node.description | markdown }}
| {% endif %}
| {% if node.properties.license_notes %}

4
src/templates/nodes/custom/page/view_embed.pug
View File

@ -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(

2
src/templates/projects/view_embed.pug
View File

@ -39,7 +39,7 @@
| {% if project.description %}
.node-details-description
| {{ project.description }}
| {{ project.description | markdown }}
| {% endif %}
| {# Until we implement urls for pages