Add next_inject helper (theme-next#1098)

tongluyang · Aug 16, 2019 · ef0a544 · ef0a544
1 parent fd69de6
commit ef0a544
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/layout/_layout.swig b/layout/_layout.swig
@@ -22,9 +22,7 @@
 <head>
   {{ partial('_partials/head/head.swig', {}, {cache: theme.cache.enable}) }}
   {% include '_partials/head/head-unique.swig' %}
-  {%- for inject_item in theme.injects.head %}
-    {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-  {%- endfor %}
+  {{- next_inject('head') }}
   <title>{% block title %}{% endblock %}</title>
   {% include '_third-party/analytics/index.swig' %}
   {{ partial('_scripts/noscript.swig', {}, {cache: theme.cache.enable}) }}
@@ -96,9 +94,7 @@
 
   {% block script_extra %}{% endblock %}
 
-  {%- for inject_item in theme.injects.bodyEnd %}
-    {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-  {%- endfor %}
+  {{- next_inject('bodyEnd') }}
 
   {%- if theme.pjax %}
     </div>

diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
@@ -152,9 +152,7 @@
             </span>
           {%- endif %}
 
-          {%- for inject_item in theme.injects.postMeta %}
-            {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-          {%- endfor %}
+          {{- next_inject('postMeta') }}
 
           {%- if config.symbols_count_time.symbols %}
           {%- if theme.symbols_count_time.separated_meta %}<br>{%- endif %}
@@ -255,9 +253,7 @@
     {%- endif %}
 
     {%- if not is_index %}
-      {%- for inject_item in theme.injects.postBodyEnd %}
-        {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-      {%- endfor %}
+      {{- next_inject('postBodyEnd') }}
 
       {%- if theme.wechat_subscriber.enable %}
         {{ partial('../_partials/post/wechat-subscriber.swig', {}, {cache: theme.cache.enable}) }}

diff --git a/layout/_macro/sidebar.swig b/layout/_macro/sidebar.swig
@@ -27,10 +27,9 @@
         <div class="site-overview">
 
           {{ partial('_partials/sidebar/site-overview.swig', {}, {cache: theme.cache.enable}) }}
-
-          {%- for inject_item in theme.injects.sidebar %}
-            {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-          {%- endfor %}
+
+          {{- next_inject('sidebar') }}
+
         </div>
       </div>
 

diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
@@ -55,6 +55,4 @@
 #}</div>
 {%- endif %}
 
-{%- for inject_item in theme.injects.footer %}
-  {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-{%- endfor %}
+{{- next_inject('footer') }}
diff --git a/layout/_partials/header/index.swig b/layout/_partials/header/index.swig
@@ -16,6 +16,4 @@
   </div>
 {%- endif %}
 
-{%- for inject_item in theme.injects.header %}
-  {{ partial(inject_item.layout, inject_item.locals, inject_item.options) }}
-{%- endfor %}
+{{- next_inject('header') }}
diff --git a/scripts/helpers/next-inject.js b/scripts/helpers/next-inject.js
@@ -0,0 +1,9 @@
+/* global hexo */
+
+'use strict';
+
+hexo.extend.helper.register('next_inject', function(point) {
+  return hexo.theme.config.injects[point]
+    .map(item => this.partial(item.layout, item.locals, item.options))
+    .join('');
+});