From d2f619ace95bfc9f5c7bf0516799b08d6aa7b308 Mon Sep 17 00:00:00 2001 From: 1v9 Date: Sun, 20 Oct 2019 08:45:50 +0800 Subject: [PATCH] Code style update (#732) * unify naming element of forEach * omit curly braces of simple return statement --- README.md | 2 +- docs/ru/README.md | 2 +- docs/zh-CN/README.md | 2 +- gulpfile.js | 6 +--- layout/_partials/comments.swig | 6 ++-- scripts/filters/default-injects.js | 4 +-- scripts/filters/post.js | 8 ++---- scripts/helpers/font.js | 4 +-- source/js/local-search.js | 16 ++++------- source/js/utils.js | 46 +++++++++++++++--------------- 10 files changed, 40 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 84d3932522..dcb58e3304 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@
- +
diff --git a/docs/ru/README.md b/docs/ru/README.md index c02c24c420..e5b56d4566 100644 --- a/docs/ru/README.md +++ b/docs/ru/README.md @@ -18,7 +18,7 @@
- +
diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index 6d3170a9d4..11ebed2d33 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -18,7 +18,7 @@
- +
diff --git a/gulpfile.js b/gulpfile.js index 6df21e0a0c..fe23b4141b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -42,11 +42,7 @@ gulp.task('validate:languages', cb => { } }); - if (errors.length === 0) { - return cb(); - } else { - return cb(errors); - } + return errors.length === 0 ? cb() : cb(errors); }); gulp.task('default', gulp.series('lint', 'validate:config', 'validate:languages')); diff --git a/layout/_partials/comments.swig b/layout/_partials/comments.swig index 404a834956..61851ff4d4 100644 --- a/layout/_partials/comments.swig +++ b/layout/_partials/comments.swig @@ -17,11 +17,11 @@ (function() { let commentButton = document.querySelectorAll('.comment-button'); - commentButton.forEach(item => { + commentButton.forEach(element => { let commentClass = item.classList[2]; - item.addEventListener('click', () => { + element.addEventListener('click', () => { commentButton.forEach(rmActive => rmActive.classList.remove('active')); - item.classList.add('active'); + element.classList.add('active'); document.querySelectorAll('.comment-position').forEach(rmActive => rmActive.classList.remove('active')); document.querySelector(`.comment-position.${commentClass}`).classList.add('active'); {%- if theme.comments.storage %} diff --git a/scripts/filters/default-injects.js b/scripts/filters/default-injects.js index 222bba9f9e..5f614b9ff1 100644 --- a/scripts/filters/default-injects.js +++ b/scripts/filters/default-injects.js @@ -7,9 +7,7 @@ const points = require('../events/lib/injects-point'); hexo.extend.filter.register('theme_inject', injects => { let filePath = hexo.theme.config.custom_file_path; - if (!filePath) { - return; - } + if (!filePath) return; points.views.forEach(key => { if (filePath[key]) { diff --git a/scripts/filters/post.js b/scripts/filters/post.js index 5e09ae3401..533bdc680f 100644 --- a/scripts/filters/post.js +++ b/scripts/filters/post.js @@ -10,9 +10,7 @@ hexo.extend.filter.register('after_post_render', data => { exturl : theme.exturl, lazyload: theme.lazyload }; - if (!filters.excerpt && !filters.exturl && !filters.lazyload) { - return; - } + if (!filters.excerpt && !filters.exturl && !filters.lazyload) return; const cheerio = require('cheerio'); const $ = cheerio.load(data.content, { decodeEntities: false @@ -54,9 +52,7 @@ hexo.extend.filter.register('after_post_render', data => { }); var length = 0; elements.each((i, o) => { - if (length > theme.auto_excerpt.length) { - return; - } + if (length > theme.auto_excerpt.length) return; length += $(o).text().length; _$.root().append($(o).remove()); }); diff --git a/scripts/helpers/font.js b/scripts/helpers/font.js index a381adaa1a..8e65696e00 100644 --- a/scripts/helpers/font.js +++ b/scripts/helpers/font.js @@ -5,9 +5,7 @@ hexo.extend.helper.register('next_font', () => { var config = hexo.theme.config.font; - if (!config || !config.enable) { - return ''; - } + if (!config || !config.enable) return ''; var fontDisplay = '&display=swap'; var fontSubset = '&subset=latin,latin-ext'; diff --git a/source/js/local-search.js b/source/js/local-search.js index 08c050888e..30f648fee5 100644 --- a/source/js/local-search.js +++ b/source/js/local-search.js @@ -33,9 +33,7 @@ window.addEventListener('DOMContentLoaded', () => { const getIndexByWord = (word, text, caseSensitive) => { let wordLen = word.length; - if (wordLen === 0) { - return []; - } + if (wordLen === 0) return []; let startPosition = 0; let position = []; let index = []; @@ -116,9 +114,7 @@ window.addEventListener('DOMContentLoaded', () => { // Perform local searching datas.forEach(data => { // Only match articles with not empty titles - if (!data.title) { - return; - } + if (!data.title) return; let searchTextCount = 0; let title = data.title.trim(); let titleInLowerCase = title.toLowerCase(); @@ -244,11 +240,11 @@ window.addEventListener('DOMContentLoaded', () => { .then(res => { // Get the contents from search data isfetched = true; - datas = isXml ? [...new DOMParser().parseFromString(res, 'text/xml').querySelectorAll('entry')].map(item => { + datas = isXml ? [...new DOMParser().parseFromString(res, 'text/xml').querySelectorAll('entry')].map(element => { return { - title : item.querySelector('title').innerHTML, - content: item.querySelector('content').innerHTML, - url : item.querySelector('url').innerHTML + title : element.querySelector('title').innerHTML, + content: element.querySelector('content').innerHTML, + url : element.querySelector('url').innerHTML }; }) : JSON.parse(res); diff --git a/source/js/utils.js b/source/js/utils.js index 5d6d44762e..a249585386 100644 --- a/source/js/utils.js +++ b/source/js/utils.js @@ -59,7 +59,7 @@ NexT.utils = { * One-click copy code support. */ registerCopyCode: function() { - document.querySelectorAll('figure.highlight').forEach(e => { + document.querySelectorAll('figure.highlight').forEach(element => { const initButton = button => { if (CONFIG.copycode.style === 'mac') { button.innerHTML = ''; @@ -69,13 +69,13 @@ NexT.utils = { }; const box = document.createElement('div'); box.classList.add('highlight-wrap'); - e.wrap(box); - e.parentNode.insertAdjacentHTML('beforeend', '
'); - var button = e.parentNode.querySelector('.copy-btn'); + element.wrap(box); + element.parentNode.insertAdjacentHTML('beforeend', '
'); + var button = element.parentNode.querySelector('.copy-btn'); button.addEventListener('click', event => { var target = event.currentTarget; - var code = [...target.parentNode.querySelectorAll('.code .line')].map(element => { - return element.innerText; + var code = [...target.parentNode.querySelectorAll('.code .line')].map(line => { + return line.innerText; }).join('\n'); var ta = document.createElement('textarea'); var yPosition = window.scrollY; @@ -112,28 +112,28 @@ NexT.utils = { }, wrapTableWithBox: function() { - document.querySelectorAll('table').forEach(table => { + document.querySelectorAll('table').forEach(element => { const box = document.createElement('div'); box.className = 'table-container'; - table.wrap(box); + element.wrap(box); }); }, registerVideoIframe: function() { document.querySelectorAll('iframe').forEach(element => { - const SUPPORTED_PLAYERS = [ + const supported = [ 'www.youtube.com', 'player.vimeo.com', 'player.youku.com', 'player.bilibili.com', 'www.tudou.com' - ]; - const pattern = new RegExp(SUPPORTED_PLAYERS.join('|')); - if (!element.parentNode.matches('.video-container') && element.src.search(pattern) > 0) { + ].some(host => element.src.includes(host)); + if (supported && !element.parentNode.matches('.video-container')) { const box = document.createElement('div'); box.className = 'video-container'; element.wrap(box); - let width = Number(element.width); let height = Number(element.height); + let width = Number(element.width); + let height = Number(element.height); if (width && height) { element.parentNode.style.paddingTop = (height / width * 100) + '%'; } @@ -179,20 +179,20 @@ NexT.utils = { */ registerTabsTag: function() { // Binding `nav-tabs` & `tab-content` by real time permalink changing. - document.querySelectorAll('.tabs ul.nav-tabs .tab').forEach(tab => { - tab.addEventListener('click', event => { + document.querySelectorAll('.tabs ul.nav-tabs .tab').forEach(element => { + element.addEventListener('click', event => { event.preventDefault(); var target = event.currentTarget; // Prevent selected tab to select again. if (!target.classList.contains('active')) { // Add & Remove active class on `nav-tabs` & `tab-content`. - [...target.parentNode.children].forEach(item => { - item.classList.remove('active'); + [...target.parentNode.children].forEach(element => { + element.classList.remove('active'); }); target.classList.add('active'); var tActive = document.getElementById(target.querySelector('a').getAttribute('href').replace('#', '')); - [...tActive.parentNode.children].forEach(item => { - item.classList.remove('active'); + [...tActive.parentNode.children].forEach(element => { + element.classList.remove('active'); }); tActive.classList.add('active'); // Trigger event @@ -208,8 +208,8 @@ NexT.utils = { registerCanIUseTag: function() { // Get responsive height passed from iframe. - window.addEventListener('message', e => { - var data = e.data; + window.addEventListener('message', event => { + var data = event.data; if ((typeof data === 'string') && (data.indexOf('ciu_embed') > -1)) { var featureID = data.split(':')[1]; var height = data.split(':')[2]; @@ -301,8 +301,8 @@ NexT.utils = { rootMargin: marginTop + 'px 0px -100% 0px', threshold : 0 }); - sections.forEach(item => { - item && intersectionObserver.observe(item); + sections.forEach(element => { + element && intersectionObserver.observe(element); }); } createIntersectionObserver(document.documentElement.scrollHeight);