mirror of
https://github.com/jerryc127/hexo-theme-butterfly.git
synced 2026-06-06 05:11:45 +08:00
breaking changes: CDN 配置了 version 為 true, 本地鏈接也會加上版本號 closed #1218
breaking changes: CDN option 部分參數名字修改 feat: 升級 fancybox 到 v5 feat: 更新 facebook js 版本 feat: 移除 gitter 聊天插件 closed #1212 improvement: 社交圖標 hover 旋轉180度 closed #1195 improvement: 代碼優化 fix: 開啟 archor 後, pace.js 會隨着 archor 添加而觸發的問題 fix: 修復設置圖片時,圖片後綴大寫而導致識別錯誤的 bug closed #1205
This commit is contained in:
@@ -41,7 +41,7 @@ hexo.extend.filter.register('before_generate', () => {
|
||||
}
|
||||
}
|
||||
|
||||
const minFile = (file) => {
|
||||
const minFile = file => {
|
||||
return file.replace(/(?<!\.min)\.(js|css)$/g, ext => '.min' + ext)
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ hexo.extend.filter.register('before_generate', () => {
|
||||
const cdnjs_file = file.replace(/^[lib|dist]*\/|browser\//g, '')
|
||||
const min_cdnjs_file = minFile(cdnjs_file)
|
||||
if (cond === 'internal') file = `source/${file}`
|
||||
const verType = CDN.version ? `@${version}` : ''
|
||||
const verType = CDN.version ? (type === 'local' ? `?v=${version}` : `@${version}`) : ''
|
||||
|
||||
const value = {
|
||||
version,
|
||||
@@ -67,7 +67,7 @@ hexo.extend.filter.register('before_generate', () => {
|
||||
}
|
||||
|
||||
const cdnSource = {
|
||||
local: cond === 'internal' ? cdnjs_file : `/pluginsSrc/${name}/${file}`,
|
||||
local: cond === 'internal' ? `${cdnjs_file + verType}` : `/pluginsSrc/${name}/${file + verType}`,
|
||||
jsdelivr: `https://cdn.jsdelivr.net/npm/${name}${verType}/${min_file}`,
|
||||
unpkg: `https://unpkg.com/${name}${verType}/${file}`,
|
||||
cdnjs: `https://cdnjs.cloudflare.com/ajax/libs/${cdnjs_name}/${version}/${min_cdnjs_file}`,
|
||||
@@ -77,7 +77,7 @@ hexo.extend.filter.register('before_generate', () => {
|
||||
data[key] = cdnSource[type]
|
||||
})
|
||||
|
||||
if (cond === 'internal') data.main_css = 'css/index.css'
|
||||
if (cond === 'internal') data.main_css = 'css/index.css' + (CDN.version ? `?v=${version}` : '')
|
||||
return data
|
||||
}
|
||||
|
||||
@@ -90,6 +90,9 @@ hexo.extend.filter.register('before_generate', () => {
|
||||
return obj
|
||||
}
|
||||
|
||||
themeConfig.asset = Object.assign(createCDNLink(internalSrc, CDN.internal_provider, 'internal'),
|
||||
createCDNLink(thirdPartySrc, CDN.third_party_provider), deleteNullValue(CDN.option))
|
||||
themeConfig.asset = Object.assign(
|
||||
createCDNLink(internalSrc, CDN.internal_provider, 'internal'),
|
||||
createCDNLink(thirdPartySrc, CDN.third_party_provider),
|
||||
deleteNullValue(CDN.option)
|
||||
)
|
||||
})
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
'use strict'
|
||||
|
||||
hexo.extend.filter.register('before_post_render', function (data) {
|
||||
const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
|
||||
const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
|
||||
let randomCover
|
||||
let coverVal = data.cover
|
||||
|
||||
|
||||
@@ -94,7 +94,7 @@ hexo.extend.helper.register('findArchivesTitle', function (page, menu, date) {
|
||||
})
|
||||
|
||||
hexo.extend.helper.register('isImgOrUrl', function (path) {
|
||||
const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/
|
||||
const imgTestReg = /\.(png|jpe?g|gif|svg|webp)(\?.*)?$/i
|
||||
if (path.indexOf('//') !== -1 || imgTestReg.test(path)) {
|
||||
return true
|
||||
}
|
||||
|
||||
+4
-11
@@ -15,18 +15,10 @@ function gallery (args, content) {
|
||||
args = args.join(' ').split(',')
|
||||
let rowHeight, limit, lazyload, type, dataStr
|
||||
|
||||
// url,[link],[lazyload],[rowHeight],[limit]
|
||||
if (args[0] === 'url') {
|
||||
dataStr = args[1]
|
||||
lazyload = args[2] === 'true'
|
||||
rowHeight = args[3] || 220
|
||||
limit = args[4] || 10
|
||||
type = ' url'
|
||||
[type, dataStr, lazyload, rowHeight = 220, limit = 10] = args // url,[link],[lazyload],[rowHeight],[limit]
|
||||
} else {
|
||||
rowHeight = args[1] || 220
|
||||
limit = args[2] || 10
|
||||
lazyload = args[0] === 'true'
|
||||
type = ' data'
|
||||
[lazyload, rowHeight = 220, limit = 10] = args // [lazyload],[rowHeight],[limit]
|
||||
const regex = /!\[(.*?)\]\(([^\s]*)\s*(?:["'](.*?)["']?)?\s*\)/g
|
||||
let m
|
||||
const arr = []
|
||||
@@ -44,7 +36,8 @@ function gallery (args, content) {
|
||||
dataStr = JSON.stringify(arr)
|
||||
}
|
||||
|
||||
const lazyloadClass = lazyload ? 'lazyload' : ''
|
||||
type = type ? ' url' : ' data'
|
||||
const lazyloadClass = lazyload === 'true' ? 'lazyload' : ''
|
||||
|
||||
return `<div class="gallery">
|
||||
<div class="fj-gallery ${lazyloadClass + type}" data-rowHeight="${rowHeight}" data-limit="${limit}">
|
||||
|
||||
Reference in New Issue
Block a user