修复使用bangumi源时套用bili模板;优化Pjax兼容性(#311)

HCLonely · Jun 13, 2023 · 5926ee8 · 5926ee8
1 parent 7cf5672
commit 5926ee8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/lib/bangumi-generator.js b/lib/bangumi-generator.js
@@ -112,7 +112,7 @@ module.exports = /*#__PURE__*/function () {
               showMyComment: (_config$type$showMyCo = config[type].showMyComment) !== null && _config$type$showMyCo !== void 0 ? _config$type$showMyCo : false,
               pagination: (_config$type$paginati = config[type].pagination) !== null && _config$type$paginati !== void 0 ? _config$type$paginati : false,
               theme: fs.existsSync(path.join(__dirname, "templates/theme/".concat(config.theme, ".min.css"))) ? config.theme : null,
-              ejsTemplate: fs.readFileSync(path.join(__dirname, "templates/".concat(config[type].source === 'bgm' ? 'bgm' : 'bili', "-template.ejs"))).toString().replace('class="bangumi-item"', 'class="bangumi-item bangumi-hide"'),
+              ejsTemplate: fs.readFileSync(path.join(__dirname, "templates/".concat(config[type].source === 'bili' ? 'bili' : 'bgm', "-template.ejs"))).toString().replace('class="bangumi-item"', 'class="bangumi-item bangumi-hide"'),
               wantWatch: wantWatch,
               watched: watched,
               watching: watching,

diff --git a/lib/templates/bangumi.ejs b/lib/templates/bangumi.ejs
@@ -29,44 +29,45 @@
     <div id="bangumi-item1">
         <% if (pagination) { %>
         <% wantWatch.slice(0, 10).forEach(function(item){ %>
-        <%- include((source === 'bgm' ? 'bgm' : 'bili') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
+        <%- include((source === 'bili' ? 'bili' : 'bgm') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
         <% }); %>
         <%- include('pagination.ejs', {__: __}) %>
         <% } else { %>
         <% wantWatch.forEach(function(item){ %>
-        <%- include((source === 'bgm' ? 'bgm' : 'bili') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
+        <%- include((source === 'bili' ? 'bili' : 'bgm') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
         <% }); %>
         <%- include('pagination.ejs', {__: __}) %>
         <% } %>
     </div>
     <div id="bangumi-item2">
         <% if (pagination) { %>
         <% watching.slice(0, 10).forEach(function(item){ %>
-        <%- include((source === 'bgm' ? 'bgm' : 'bili') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
+        <%- include((source === 'bili' ? 'bili' : 'bgm') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
         <% }); %>
         <%- include('pagination.ejs', {__: __}) %>
         <% } else { %>
         <% watching.forEach(function(item){ %>
-        <%- include((source === 'bgm' ? 'bgm' : 'bili') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
+        <%- include((source === 'bili' ? 'bili' : 'bgm') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
         <% }); %>
         <%- include('pagination.ejs', {__: __}) %>
         <% } %>
     </div>
     <div id="bangumi-item3">
         <% if (pagination) { %>
         <% watched.slice(0, 10).forEach(function(item){ %>
-        <%- include((source === 'bgm' ? 'bgm' : 'bili') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
+        <%- include((source === 'bili' ? 'bili' : 'bgm') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
         <% }); %>
         <%- include('pagination.ejs', {__: __}) %>
         <% } else { %>
         <% watched.forEach(function(item){ %>
-        <%- include((source === 'bgm' ? 'bgm' : 'bili') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
+        <%- include((source === 'bili' ? 'bili' : 'bgm') + '-template.ejs', {item,loading,metaColor,type,lazyloadAttrName,srcValue}) %>
         <% }); %>
         <%- include('pagination.ejs', {__: __}) %>
         <% } %>
     </div>
 </div>
 <script>
+    (function () {
     <% if (pagination) { %>
     const ejsTemplate = '<%- ejsTemplate.replace(/\n/g, '') %>';
     const loading = '<%- loading %>';
@@ -80,4 +81,5 @@
     <%- include('index.js') %>
     document.getElementsByClassName('bangumi-tab')[<%- show %>].click();
     <%- include('pagination.js', {__: __}) %>
+    })();
 </script>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-bilibili-bangumi",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "description": "hexo bilibili番剧页",
   "main": "index.js",
   "scripts": {

diff --git a/src/lib/bangumi-generator.js b/src/lib/bangumi-generator.js
@@ -79,7 +79,7 @@ module.exports = async function (locals, type = 'bangumi') {
     showMyComment: config[type].showMyComment ?? false,
     pagination: config[type].pagination ?? false,
     theme: fs.existsSync(path.join(__dirname, `templates/theme/${config.theme}.min.css`)) ? config.theme : null,
-    ejsTemplate: fs.readFileSync(path.join(__dirname, `templates/${config[type].source === 'bgm' ? 'bgm' : 'bili'}-template.ejs`)).toString()
+    ejsTemplate: fs.readFileSync(path.join(__dirname, `templates/${config[type].source === 'bili' ? 'bili' : 'bgm'}-template.ejs`)).toString()
       .replace('class="bangumi-item"', 'class="bangumi-item bangumi-hide"'),
     wantWatch,
     watched,