Merge branch 'master' of gitee.com:_init_/hexo_blog
This commit is contained in:
结发受长生
commit
e9c28a3cc4
@ -1,7 +1,7 @@
|
||||
const gulp = require('gulp'),
|
||||
htmlmin = require('gulp-htmlmin'), //html压缩组件
|
||||
htmlclean = require('gulp-htmlclean'), //html清理组件
|
||||
plumber = require('gulp-plumber'), //容错组件（发生错误不跳出任务，并报出错误内容）
|
||||
// plumber = require('gulp-plumber'), //容错组件（发生错误不跳出任务，并报出错误内容）
|
||||
Hexo = require('hexo')
|
||||
|
||||
// 程序执行的传参
|
||||
@ -44,7 +44,7 @@ gulp.task('compressHtml', () => {
|
||||
minifyURLs: true //替换页面URL
|
||||
}
|
||||
return gulp.src('./public/**/*.html')
|
||||
.pipe(plumber())
|
||||
// .pipe(plumber())
|
||||
.pipe(htmlclean(cleanOptions))
|
||||
.pipe(htmlmin(minOption))
|
||||
.pipe(gulp.dest('./public'))
|
||||
|
||||
@ -29,7 +29,6 @@
|
||||
"gulp": "^4.0.2",
|
||||
"gulp-htmlclean": "^2.7.22",
|
||||
"gulp-htmlmin": "^5.0.1",
|
||||
"gulp-plumber": "^1.2.1",
|
||||
"optimist": "^0.6.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -31,25 +31,27 @@ function loadMoreItems(step) {
|
||||
var itemContainer = document.createElement('div')
|
||||
var index = currentIndex
|
||||
while(index<currentIndex+step && index<res.data.files.length) {
|
||||
let imgHeight = null, imgUrl = `${themeConfig.pictureCdn}/${res.data.files[index].name}`
|
||||
let imgHeight = null, imgFile = res.data.files[index],
|
||||
imgSrc = `${themeConfig.pictureCdn}/${imgFile.name}`,
|
||||
imgThumbnail = imgFile.thumbnail ? `${themeConfig.pictureCdn}/${imgFile.thumbnail}` : imgSrc
|
||||
let wrapperWidth = photoWallWrapper.getBoundingClientRect().width
|
||||
// 列宽240px 列间距20px, 计算每列宽度
|
||||
let columnWidth = (wrapperWidth + 20) / Math.floor((wrapperWidth + 20) / (240 + 20)) - 20
|
||||
// 图片的实际显示高度
|
||||
imgHeight = (columnWidth / res.data.files[index].width) * res.data.files[index].height
|
||||
imgHeight = (columnWidth / imgFile.width) * imgFile.height
|
||||
imgHeight = Math.round(imgHeight * 100) / 100 // 四舍五入保留2位小数
|
||||
items.push({
|
||||
msrc: imgUrl, // 缩略图的地址(在动画过程中显示的是缩略图, 这里暂且用相同的地址了)
|
||||
src: imgUrl,
|
||||
w: res.data.files[index].width,
|
||||
h: res.data.files[index].height,
|
||||
title: res.data.files[index].name
|
||||
msrc: imgThumbnail, // 缩略图的地址
|
||||
src: imgSrc,
|
||||
w: imgFile.width,
|
||||
h: imgFile.height,
|
||||
title: imgFile.name
|
||||
})
|
||||
let imgItemDiv = document.createElement('div'), imgItem = document.createElement('img')
|
||||
imgItemDiv.classList.add('item')
|
||||
imgItemDiv.style.height = imgHeight+'px'
|
||||
imgItem.classList.add('item-img')
|
||||
imgItem.setAttribute('src', imgUrl)
|
||||
imgItem.setAttribute('src', imgThumbnail)
|
||||
imgItem.addEventListener('click', (function(totalIndex){
|
||||
return function(e) {
|
||||
// slider展开状态
|
||||
|
||||
65
yarn.lock
65
yarn.lock
@ -51,13 +51,6 @@ ansi-colors@^1.0.1:
|
||||
dependencies:
|
||||
ansi-wrap "^0.1.0"
|
||||
|
||||
ansi-cyan@^0.1.1:
|
||||
version "0.1.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
|
||||
integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
|
||||
dependencies:
|
||||
ansi-wrap "0.1.0"
|
||||
|
||||
ansi-gray@^0.1.1:
|
||||
version "0.1.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
|
||||
@ -65,13 +58,6 @@ ansi-gray@^0.1.1:
|
||||
dependencies:
|
||||
ansi-wrap "0.1.0"
|
||||
|
||||
ansi-red@^0.1.1:
|
||||
version "0.1.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
|
||||
integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
|
||||
dependencies:
|
||||
ansi-wrap "0.1.0"
|
||||
|
||||
ansi-regex@^2.0.0:
|
||||
version "2.1.1"
|
||||
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
|
||||
@ -137,14 +123,6 @@ argparse@^1.0.7:
|
||||
dependencies:
|
||||
sprintf-js "~1.0.2"
|
||||
|
||||
arr-diff@^1.0.1:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
|
||||
integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
|
||||
dependencies:
|
||||
arr-flatten "^1.0.1"
|
||||
array-slice "^0.2.3"
|
||||
|
||||
arr-diff@^2.0.0:
|
||||
version "2.0.0"
|
||||
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
|
||||
@ -173,11 +151,6 @@ arr-map@^2.0.0, arr-map@^2.0.2:
|
||||
dependencies:
|
||||
make-iterator "^1.0.0"
|
||||
|
||||
arr-union@^2.0.1:
|
||||
version "2.1.0"
|
||||
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
|
||||
integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
|
||||
|
||||
arr-union@^3.1.0:
|
||||
version "3.1.0"
|
||||
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
|
||||
@ -202,11 +175,6 @@ array-last@^1.1.1:
|
||||
dependencies:
|
||||
is-number "^4.0.0"
|
||||
|
||||
array-slice@^0.2.3:
|
||||
version "0.2.3"
|
||||
resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
|
||||
integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
|
||||
|
||||
array-slice@^1.0.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
|
||||
@ -970,13 +938,6 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
|
||||
dependencies:
|
||||
homedir-polyfill "^1.0.1"
|
||||
|
||||
extend-shallow@^1.1.2:
|
||||
version "1.1.4"
|
||||
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
|
||||
integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
|
||||
dependencies:
|
||||
kind-of "^1.1.0"
|
||||
|
||||
extend-shallow@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
|
||||
@ -1353,16 +1314,6 @@ gulp-htmlmin@^5.0.1:
|
||||
plugin-error "^1.0.1"
|
||||
through2 "^2.0.3"
|
||||
|
||||
gulp-plumber@^1.2.1:
|
||||
version "1.2.1"
|
||||
resolved "https://registry.yarnpkg.com/gulp-plumber/-/gulp-plumber-1.2.1.tgz#d38700755a300b9d372318e4ffb5ff7ced0b2c84"
|
||||
integrity sha512-mctAi9msEAG7XzW5ytDVZ9PxWMzzi1pS2rBH7lA095DhMa6KEXjm+St0GOCc567pJKJ/oCvosVAZEpAey0q2eQ==
|
||||
dependencies:
|
||||
chalk "^1.1.3"
|
||||
fancy-log "^1.3.2"
|
||||
plugin-error "^0.1.2"
|
||||
through2 "^2.0.3"
|
||||
|
||||
gulp@^4.0.2:
|
||||
version "4.0.2"
|
||||
resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
|
||||
@ -1961,11 +1912,6 @@ keyword-extractor@latest:
|
||||
underscore "1.9.1"
|
||||
underscore.string "3.3.5"
|
||||
|
||||
kind-of@^1.1.0:
|
||||
version "1.1.0"
|
||||
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
|
||||
integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
|
||||
|
||||
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
|
||||
version "3.2.2"
|
||||
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
|
||||
@ -2729,17 +2675,6 @@ pinkie@^2.0.0:
|
||||
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
|
||||
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
|
||||
|
||||
plugin-error@^0.1.2:
|
||||
version "0.1.2"
|
||||
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
|
||||
integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
|
||||
dependencies:
|
||||
ansi-cyan "^0.1.1"
|
||||
ansi-red "^0.1.1"
|
||||
arr-diff "^1.0.1"
|
||||
arr-union "^2.0.1"
|
||||
extend-shallow "^1.1.2"
|
||||
|
||||
plugin-error@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user