mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-06-05 21:01:46 +08:00
v2.1.0
1. 可設置隱藏文章 2. 適配 Hexo 的 Tag Plugins Code Block With marked lines 顯示 3. 可配置首頁cover顯示的位置 4. 更改深色模式下的配色 5. activate_power_mode 增加關閉顏色和抖動 6. 增加谷歌廣告,騰訊分析 7. 相關文章增加時間顯示,調整佈局,垂直居中 8. 文章頁面,top_img增加評論數顯示 9. 可以取消點擊圖片觀看大圖 10. mathjax和kathex可設置每頁都加載還是按需加載 11. 深色模式下,滾動條顔色的適配 12. 優化gitalk 在 dark mode下的顯示 13. 文章頁,文章標題過長時,只顯示三行內容 14. 深色模式下,背景圖片加上蒙板 15. 優化深色/閲讀模式下,canvas的顯示 16. 優化打賞的特效和移動到二維碼不會立刻消失 17. 優化sub-menu樣式 18. 修改aside 的tags顔色,在深色模式下不會出現觀看困難 19. 升級 normalize.css 到最新版 20. 優化手機上toc和menu的打開動畫 21. 優化代碼框打開關閉的特效 22. 精簡js,部分操作改為css控制 23. 優化主題的一些動畫,不會過於生硬 1. 修復當圖片被a標簽包圍時,點擊圖標沒有跳轉到對應網頁而是出現大圖觀看模式的bug 2. 修復當網址有subdirectory時,menu、打賞二維碼和lodding_bg 鏈接路徑錯誤的bug 3. 修復當網址有subdirectory時, 4. 修復katex 的 CSS無法讀取bug 5. 修復搜索按鈕在文章頁不顯示的bug 6. 修復gitalk css引用失敗的bug 7. 修復 點擊特效 煙花 無效的bug 8. 修復gitalk報path.startsWith is not a function的bug 9. 修復 閲讀模式下,背景沒有變純色的bug 10. 修復閲讀模式下,header 偶爾出現沒有靠攏頂部的bug 11. 修復Hexo Tag Plugins Block Quote 裏的鏈接顯示出外面的Bug 12. 修復aside歸檔日期過長導致錯位的bug 13. 修復toc為空時,toc按鈕仍存在的bug 14. 修復關閉懶加載後,頭像無法顯示的bug 15. 修復深色模式下,切換readmode偶爾會無效的bug 16. 修復在一些手機設備上,toc和menu的按鈕顯示不對齊的bug #72
This commit is contained in:
@@ -0,0 +1,63 @@
|
||||
/**
|
||||
* global hexo
|
||||
* from printempw/hexo-hide-posts
|
||||
* modify by Jerry
|
||||
*/
|
||||
|
||||
'use strict';
|
||||
|
||||
var public_generators = [];
|
||||
|
||||
hexo.extend.filter.register('before_generate', function () {
|
||||
this._bindLocals();
|
||||
|
||||
const all_posts = this.locals.get('posts');
|
||||
const hidden_posts = all_posts.find({
|
||||
'hide': true
|
||||
});
|
||||
const normal_posts = all_posts.filter(post => !post['hide']);
|
||||
|
||||
this.locals.set('all_posts', all_posts);
|
||||
this.locals.set('hidden_posts', hidden_posts);
|
||||
this.locals.set('posts', normal_posts);
|
||||
});
|
||||
|
||||
hexo.extend.filter.register('after_init', function () {
|
||||
|
||||
const original = {};
|
||||
for (const name in hexo.extend.generator.list()) {
|
||||
original[name] = hexo.extend.generator.get(name);
|
||||
}
|
||||
|
||||
hexo.extend.generator.register('post', async function (locals) {
|
||||
const fg = original.post.bind(this);
|
||||
|
||||
const generated_public = await fg(locals);
|
||||
const generated_hidden = await fg(Object.assign({}, locals, {
|
||||
posts: locals.hidden_posts
|
||||
}));
|
||||
|
||||
// Remove post.prev and post.next for hidden posts
|
||||
generated_hidden.forEach(ele => {
|
||||
ele.data.prev = ele.data.next = null;
|
||||
});
|
||||
|
||||
return generated_public.concat(generated_hidden);
|
||||
});
|
||||
|
||||
// Then we hack into other generators if necessary
|
||||
public_generators.filter(
|
||||
name => Object.keys(original).includes(name)
|
||||
).forEach(name => {
|
||||
// Overwrite original generator
|
||||
hexo.extend.generator.register(name, function (locals) {
|
||||
const fg = original[name].bind(this);
|
||||
|
||||
return fg(Object.assign({}, locals, {
|
||||
posts: new locals.posts.constructor(
|
||||
locals.posts.data.concat(locals.hidden_posts.data)
|
||||
)
|
||||
}));
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,57 @@
|
||||
'use strict';
|
||||
hexo.extend.filter.register('after_post_render', data => {
|
||||
|
||||
const cheerio = require('cheerio');
|
||||
|
||||
const $ = cheerio.load(data.content, {
|
||||
decodeEntities: false
|
||||
});
|
||||
var theme = hexo.theme.config;
|
||||
|
||||
if (theme.highlight_shrink === 'none' && !theme.highlight_lang && !theme.highlight_copy) {
|
||||
return;
|
||||
}
|
||||
|
||||
$('figure.highlight').wrap('<div class="code-area-wrap"></div>')
|
||||
var $highlight_layout = $('<div class="highlight-tools"></div>')
|
||||
|
||||
$('figure').before($highlight_layout)
|
||||
|
||||
if (theme.highlight_shrink == true) {
|
||||
var $code_expand = $('<i class="fa fa-angle-down code-expand code-closed" aria-hidden="true"></i>')
|
||||
$('.highlight-tools').append($code_expand)
|
||||
} else if (theme.highlight_shrink === false) {
|
||||
var $code_expand = $('<i class="fa fa-angle-down code-expand" aria-hidden="true"></i>')
|
||||
$('.highlight-tools').append($code_expand)
|
||||
}
|
||||
|
||||
if (theme.highlight_lang) {
|
||||
var $highlight_lang = $('<div class="code_lang"></div>')
|
||||
$('.highlight-tools').append($highlight_lang)
|
||||
var lang_name_index;
|
||||
var lang_name;
|
||||
$('figure').each(function () {
|
||||
lang_name_index = lang_name = $(this).attr('class').split(' ')[1];
|
||||
if (lang_name_index == 'js')
|
||||
lang_name = 'Javascript'
|
||||
if (lang_name_index == 'md')
|
||||
lang_name = 'Markdown'
|
||||
if (lang_name_index == 'plain')
|
||||
lang_name = 'Code'
|
||||
if (lang_name_index == 'py')
|
||||
lang_name = 'Python'
|
||||
|
||||
$(this).prev().find(".code_lang").text(lang_name)
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
if (theme.highlight_copy) {
|
||||
var $copyIcon = $('<i class="fa fa-clipboard" aria-hidden="true"></i>')
|
||||
var $notice = $('<div class="copy-notice"></div>')
|
||||
$('.highlight-tools').append($notice)
|
||||
$('.highlight-tools').append($copyIcon)
|
||||
}
|
||||
|
||||
data.content = $.html();
|
||||
}, 100);
|
||||
+45
-75
@@ -1,43 +1,34 @@
|
||||
'use strict';
|
||||
"use strict";
|
||||
|
||||
hexo.extend.helper.register('list_archives', function (options = {}) {
|
||||
|
||||
const {
|
||||
config
|
||||
} = this;
|
||||
hexo.extend.helper.register("list_archives", function(options = {}) {
|
||||
const { config } = this;
|
||||
const archiveDir = config.archive_dir;
|
||||
const {
|
||||
timezone
|
||||
} = config;
|
||||
const { timezone } = config;
|
||||
const lang = this.page.lang || this.page.language || config.language;
|
||||
let {
|
||||
format
|
||||
} = options;
|
||||
const type = options.type || 'monthly';
|
||||
const {
|
||||
style = 'list', transform, separator = ', '
|
||||
} = options;
|
||||
const showCount = Object.prototype.hasOwnProperty.call(options, 'show_count') ? options.show_count : true;
|
||||
const className = options.class || 'archive';
|
||||
let { format } = options;
|
||||
const type = options.type || "monthly";
|
||||
const { style = "list", transform, separator = ", " } = options;
|
||||
const showCount = Object.prototype.hasOwnProperty.call(options, "show_count")
|
||||
? options.show_count
|
||||
: true;
|
||||
const order = options.order || -1;
|
||||
const limit = 8;
|
||||
let result = '';
|
||||
let result = "";
|
||||
|
||||
var more_button
|
||||
if (lang === 'zh-CN') {
|
||||
more_button = '查看更多';
|
||||
} else if (lang === 'zh-TW') {
|
||||
more_button = '查看更多';
|
||||
var more_button;
|
||||
if (lang === "zh-CN") {
|
||||
more_button = "查看更多";
|
||||
} else if (lang === "zh-TW") {
|
||||
more_button = "查看更多";
|
||||
} else {
|
||||
more_button = 'More';
|
||||
more_button = "More";
|
||||
}
|
||||
|
||||
|
||||
if (!format) {
|
||||
format = type === 'monthly' ? 'MMMM YYYY' : 'YYYY';
|
||||
format = type === "monthly" ? "MMMM YYYY" : "YYYY";
|
||||
}
|
||||
|
||||
const posts = this.site.posts.sort('date', order);
|
||||
const posts = this.site.posts.sort("date", order);
|
||||
if (!posts.length) return result;
|
||||
|
||||
const data = [];
|
||||
@@ -70,64 +61,43 @@ hexo.extend.helper.register('list_archives', function (options = {}) {
|
||||
const link = item => {
|
||||
let url = `${archiveDir}/${item.year}/`;
|
||||
|
||||
if (type === 'monthly') {
|
||||
if (item.month < 10) url += '0';
|
||||
if (type === "monthly") {
|
||||
if (item.month < 10) url += "0";
|
||||
url += `${item.month}/`;
|
||||
}
|
||||
|
||||
return this.url_for(url);
|
||||
};
|
||||
|
||||
if (style === 'list') {
|
||||
result += `<ul class="${className}-list">`;
|
||||
result += `<ul class="archive-list">`;
|
||||
|
||||
for (let i = 0, len = data.length; i < Math.min(len, limit); i++) {
|
||||
const item = data[i];
|
||||
for (let i = 0, len = data.length; i < Math.min(len, limit); i++) {
|
||||
const item = data[i];
|
||||
|
||||
result += `<li class="${className}-list-item">`;
|
||||
result += `<li class="archive-list-item">`;
|
||||
|
||||
result += `<a class="${className}-list-link" href="${link(item)}">`;
|
||||
result += transform ? transform(item.name) : item.name;
|
||||
|
||||
|
||||
if (showCount) {
|
||||
result += `<span class="${className}-list-count">${item.count}</span>`;
|
||||
}
|
||||
result += '</a>';
|
||||
result += '</li>';
|
||||
result += `<a class="archive-list-link" href="${link(item)}">`;
|
||||
result += `<span class="archive-list-date">`;
|
||||
result += transform ? transform(item.name) : item.name;
|
||||
result += `</span>`;
|
||||
|
||||
if (showCount) {
|
||||
result += `<span class="archive-list-count">${item.count}</span>`;
|
||||
}
|
||||
|
||||
if (data.length > limit) {
|
||||
result += `<li class="${className}-list-item">`;
|
||||
result += `<a class="${className}-list-link is_center" href="` + '/' + `${archiveDir}" >`;
|
||||
result += more_button;
|
||||
result += '</a>';
|
||||
result += '</li>';
|
||||
}
|
||||
result += '</ul>';
|
||||
} else {
|
||||
for (let i = 0, len = data.length; i < Math.min(len, limit); i++) {
|
||||
const item = data[i];
|
||||
|
||||
if (i) result += separator;
|
||||
|
||||
result += `<a class="${className}-link" href="${link(item)}">`;
|
||||
result += transform ? transform(item.name) : item.name;
|
||||
|
||||
if (showCount) {
|
||||
result += `<span class="${className}-count">${item.count}</span>`;
|
||||
}
|
||||
|
||||
result += '</a>';
|
||||
}
|
||||
if (data.length > limit) {
|
||||
result += `<a class="${className}-link" is_center" href="${archiveDir}" >`;
|
||||
result += more_button;
|
||||
result += '</a>';
|
||||
}
|
||||
|
||||
result += "</a>";
|
||||
result += "</li>";
|
||||
}
|
||||
|
||||
if (data.length > limit) {
|
||||
result += `<li class="archive-list-item">`;
|
||||
result +=
|
||||
`<a class="archive-list-link-more" href="` +
|
||||
"/" +
|
||||
`${archiveDir}" >`;
|
||||
result += more_button;
|
||||
result += "</a>";
|
||||
result += "</li>";
|
||||
}
|
||||
result += "</ul>";
|
||||
return result;
|
||||
})
|
||||
});
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
'use strict'
|
||||
hexo.extend.filter.register('after_post_render', data => {
|
||||
const theme = hexo.theme.config;
|
||||
|
||||
const cheerio = require('cheerio');
|
||||
|
||||
const $ = cheerio.load(data.content, { decodeEntities: false });
|
||||
|
||||
const images = $('img').not($('a>img'));
|
||||
|
||||
if (theme.fancybox.enable) {
|
||||
images.each((i, o) => {
|
||||
var lazyload_src = $(o).attr('src') ? $(o).attr('src') : $(o).attr("data-src")
|
||||
var alt = $(o).attr('alt')
|
||||
if (alt !== undefined) {
|
||||
$(o).attr('title', alt)
|
||||
}
|
||||
var $a = $(
|
||||
'<a href="' +
|
||||
lazyload_src +
|
||||
'" data-fancybox="group" data-caption="' +
|
||||
$(o).attr('alt') +
|
||||
'" class="fancybox"></a>'
|
||||
)
|
||||
$(o).wrap($a)
|
||||
});
|
||||
|
||||
}
|
||||
if (theme.medium_zoom.enable) {
|
||||
images.each((i, o) => {
|
||||
$(o).addClass('mediumZoom')
|
||||
})
|
||||
|
||||
var imgList = $(".justified-gallery img")
|
||||
if (imgList.length) {
|
||||
imgList.each((i, o) => {
|
||||
var $a = $('<div></div>')
|
||||
$(o).wrap($a)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
if (!theme.medium_zoom.enable && !theme.fancybox.enable) {
|
||||
var imgList = $(".justified-gallery > p >img")
|
||||
if (imgList.length) {
|
||||
imgList.each((i, o) => {
|
||||
$(o).wrap('<div></div>')
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
data.content = $.html();
|
||||
}, 100);
|
||||
@@ -1,17 +1,23 @@
|
||||
'use strict';
|
||||
const url_for = require('hexo-util').url_for.bind(hexo);
|
||||
|
||||
hexo.extend.filter.register('after_post_render', data => {
|
||||
var theme = hexo.theme.config;
|
||||
var bg = theme.lodding_bg.post;
|
||||
if (!theme.lazyload.enable) return;
|
||||
|
||||
const cheerio = require('cheerio');
|
||||
|
||||
const $ = cheerio.load(data.content, {decodeEntities: false});
|
||||
const images = $('img');
|
||||
const images = $('img').not($('.justified-gallery img'));
|
||||
if (!images.length) return;
|
||||
|
||||
images.each((i, o) => {
|
||||
let src = $(o).attr('src');
|
||||
$(o).attr('data-src', src).removeAttr('src');
|
||||
if (bg){
|
||||
$(o).attr('src',url_for(bg))
|
||||
}
|
||||
$(o).addClass('lazyload');
|
||||
});
|
||||
|
||||
|
||||
+69
-34
@@ -1,3 +1,10 @@
|
||||
const moment = require('moment-timezone');
|
||||
const {
|
||||
isMoment
|
||||
} = moment;
|
||||
|
||||
|
||||
|
||||
hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
|
||||
var relatedPosts = [];
|
||||
currentPost.tags.forEach(function (tag) {
|
||||
@@ -7,7 +14,9 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
|
||||
title: post.title,
|
||||
path: post.path,
|
||||
cover: post.cover,
|
||||
weight: 1
|
||||
weight: 1,
|
||||
updated: post.updated,
|
||||
created: post.created
|
||||
};
|
||||
var index = findItem(relatedPosts, 'path', post.path);
|
||||
if (index != -1) {
|
||||
@@ -20,67 +29,93 @@ hexo.extend.helper.register('related_posts', function (currentPost, allPosts) {
|
||||
};
|
||||
});
|
||||
});
|
||||
if (relatedPosts.length == 0) { return '' };
|
||||
if (relatedPosts.length == 0) {
|
||||
return ''
|
||||
};
|
||||
var result = "";
|
||||
var limit_num = hexo.theme.config.related_post.limit || 6
|
||||
var lang = hexo.theme.config.rootConfig.language;
|
||||
const hexoConfig = hexo.theme.config.rootConfig;
|
||||
const config = hexo.theme.config;
|
||||
|
||||
var limit_num = config.related_post.limit || 6
|
||||
var lang = hexoConfig.language;
|
||||
var date_type = config.related_post.date_type || 'created'
|
||||
var headline_lang;
|
||||
if (lang === 'zh-CN') {
|
||||
headline_lang = '相关推荐';
|
||||
} else if ( lang === 'zh-TW') {
|
||||
} else if (lang === 'zh-TW') {
|
||||
headline_lang = '相關推薦';
|
||||
} else {
|
||||
headline_lang = 'Recommend';
|
||||
}
|
||||
|
||||
|
||||
relatedPosts = relatedPosts.sort(compare('weight'));
|
||||
var lazy_src = hexo.theme.config.lazyload.enable ? lazy_src = 'data-src' : lazy_src = 'src'
|
||||
var lazy_class = hexo.theme.config.lazyload.enable ? lazy_class = 'lazyload' : lazy_class = ''
|
||||
var lazy_src = config.lazyload.enable ? lazy_src = 'data-src' : lazy_src = 'src'
|
||||
var lazy_class = config.lazyload.enable ? lazy_class = 'lazyload' : lazy_class = ''
|
||||
|
||||
if (relatedPosts.length > 0) {
|
||||
result += '<div class="relatedPosts">'
|
||||
result += '<div class="relatedPosts_headline"><i class="fa fa-fw fa-thumbs-up" aria-hidden="true"></i><span>' + ' ' + headline_lang + '</span></div>'
|
||||
result += '<div class="relatedPosts_list">'
|
||||
|
||||
for (var i = 0; i < Math.min(relatedPosts.length, limit_num); i++) {
|
||||
|
||||
var cover = relatedPosts[i].cover
|
||||
|
||||
result += '<div class="relatedPosts_item"><a href="' + hexo.theme.config.rootConfig.root + relatedPosts[i].path + '" title="' + relatedPosts[i].title + '">';
|
||||
result += '<img class="relatedPosts_cover '+ lazy_class + '"' + lazy_src + '="' + cover + '">';
|
||||
result += '<div class="relatedPosts_title">' + relatedPosts[i].title + '</div>';
|
||||
result += '</a></div>'
|
||||
for (var i = 0; i < Math.min(relatedPosts.length, limit_num); i++) {
|
||||
|
||||
var cover = relatedPosts[i].cover
|
||||
|
||||
result += '<div class="relatedPosts_item"><a href="' + hexoConfig.root + relatedPosts[i].path + '" title="' + relatedPosts[i].title + '">';
|
||||
result += '<img class="relatedPosts_cover ' + lazy_class + '"' + lazy_src + '="' + cover + '">';
|
||||
if (date_type == 'created') {
|
||||
result += '<div class="relatedPosts_main is-center"><div class="relatedPosts_date"><i class="fa fa-calendar fa-fw" aria-hidden="true"></i>' + ' ' + dateHelper(relatedPosts[i].created) + '</div>'
|
||||
} else {
|
||||
result += '<div class="relatedPosts_main"><div class="relatedPosts_date"><i class="fa fa-history fa-fw" aria-hidden="true"></i>' + ' ' + dateHelper(relatedPosts[i].updated) + '</div>'
|
||||
}
|
||||
result += '<div class="relatedPosts_title">' + relatedPosts[i].title + '</div>';
|
||||
result += '</div></a></div>'
|
||||
};
|
||||
|
||||
result += '</div><div class="clear_both"></div></div>'
|
||||
return result;
|
||||
|
||||
}
|
||||
result += '</div><div class="clear_both"></div></div>'
|
||||
return result;
|
||||
|
||||
}
|
||||
});
|
||||
hexo.extend.helper.register('echo', function(path){
|
||||
return path;
|
||||
hexo.extend.helper.register('echo', function (path) {
|
||||
return path;
|
||||
});
|
||||
function isTagRelated (tagName, TBDtags) {
|
||||
|
||||
function isTagRelated(tagName, TBDtags) {
|
||||
var result = false;
|
||||
TBDtags.forEach(function (tag) {
|
||||
if (tagName == tag.name) {
|
||||
result = true;
|
||||
};
|
||||
if (tagName == tag.name) {
|
||||
result = true;
|
||||
};
|
||||
})
|
||||
return result;
|
||||
}
|
||||
function findItem (arrayToSearch, attr, val) {
|
||||
|
||||
function findItem(arrayToSearch, attr, val) {
|
||||
for (var i = 0; i < arrayToSearch.length; i++) {
|
||||
if (arrayToSearch[i][attr] == val) {
|
||||
return i
|
||||
};
|
||||
if (arrayToSearch[i][attr] == val) {
|
||||
return i
|
||||
};
|
||||
};
|
||||
return -1;
|
||||
}
|
||||
function compare (attr) {
|
||||
|
||||
function compare(attr) {
|
||||
return function (a, b) {
|
||||
var val1 = a[attr];
|
||||
var val2 = b[attr];
|
||||
return val2 - val1;
|
||||
var val1 = a[attr];
|
||||
var val2 = b[attr];
|
||||
return val2 - val1;
|
||||
}
|
||||
}
|
||||
|
||||
function dateHelper(date) {
|
||||
const moment = getMoment(date, hexo.theme.config.rootConfig.language);
|
||||
return moment.format(hexo.theme.config.rootConfig.date_format);
|
||||
}
|
||||
|
||||
function getMoment(date, lang) {
|
||||
if (date == null) date = moment();
|
||||
if (!isMoment(date)) date = moment(isDate(date) ? date : new Date(date));
|
||||
if (lang) date = date.locale(lang);
|
||||
return date;
|
||||
}
|
||||
Reference in New Issue
Block a user