From ce0c01bede3ce985dbe67d0d25866dd8d8c496d2 Mon Sep 17 00:00:00 2001
From: regazzoj <jeanbaptiste.regazzoni@gmail.com>
Date: Tue, 21 Aug 2018 14:55:53 +0200
Subject: [PATCH] Issue #11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Custom filters are now defined in nunjucks files (see src/views/templates/element-filters/gogotags.html.njk)

______________________________________________________________________

Les filtres customs sont maintenant définis dans des fichiers nunjucks (voir src/views/templates/element-filters/gogotags.html.njk)
---
 .../template-element-filters.module.ts        | 32 +++++++------------
 .../element-filters/gogotags.html.njk         |  1 +
 2 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 src/views/templates/element-filters/gogotags.html.njk

diff --git a/src/js/modules/element/template-element-filters.module.ts b/src/js/modules/element/template-element-filters.module.ts
index 8eb353c..38b4a8d 100644
--- a/src/js/modules/element/template-element-filters.module.ts
+++ b/src/js/modules/element/template-element-filters.module.ts
@@ -10,29 +10,21 @@ declare var commonmark;
 
 export class TemplateElementFiltersModule
 {
-  nunjucksEnvironment : any;
+  filters = [ 'gogotags' ];
 
   public addGoGoFilters(nunjucksEnvironment)
   {
-    this.nunjucksEnvironment = nunjucksEnvironment;
-
     // adds custom fitlers here
-    this.addGoGoTags();
-
-    return this.nunjucksEnvironment;
-  }
-
-  private addGoGoTags()
-  {
-    this.nunjucksEnvironment.addFilter('gogotags', function(tags) {
-      let value = '<div class="tags-container">';
-      for(let currentIndex=0;currentIndex<tags.length;++currentIndex)
-      {
-        value += '<span class="gogo-tag">' + tags[currentIndex] + '</span>';
-      }
-      value += '</div>'
-
-      return value;
-    });
+    for(let currentIndex=0; currentIndex<this.filters.length; ++currentIndex)
+    {
+      let currentFilter = this.filters[currentIndex];
+      nunjucksEnvironment.addFilter(currentFilter, function(value) {
+        let objectArgument = {};
+        objectArgument[currentFilter] = value;
+        return nunjucksEnvironment.render("templates/element-filters/"+ currentFilter +".html.njk", objectArgument);
+      });
+    }
+
+    return nunjucksEnvironment;
   }
 }
\ No newline at end of file
diff --git a/src/views/templates/element-filters/gogotags.html.njk b/src/views/templates/element-filters/gogotags.html.njk
new file mode 100644
index 0000000..72bcd85
--- /dev/null
+++ b/src/views/templates/element-filters/gogotags.html.njk
@@ -0,0 +1 @@
+<div class="tags-container">{% for tag in gogotags %}<span class="gogo-tag">{{ tag }}</span>{% endfor %}</div>
\ No newline at end of file