Some minor fixes

theme-next · Dec 16, 2019 · dae6ed7 · dae6ed7 · stevenjoezhang · Dec 18, 2019
1 parent 8a9b8ca
commit dae6ed7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/scripts/events/lib/config.js b/scripts/events/lib/config.js
@@ -33,8 +33,6 @@ module.exports = hexo => {
       merge(hexo.config, data.next);
       merge(hexo.theme.config, data.next);
     }
-  } else {
-    merge(hexo.theme.config, hexo.config.theme_config);
   }
 
   if (hexo.theme.config.cache && hexo.theme.config.cache.enable && hexo.config.relative_link) {

diff --git a/source/js/utils.js b/source/js/utils.js
@@ -375,7 +375,7 @@ NexT.utils = {
   },
 
   loadComments: function(element, callback) {
-    if (!CONFIG.comments.lazyload) {
+    if (!CONFIG.comments.lazyload || !element) {
       callback();
       return;
     }