Release v1.2.9

Author: BNDong

docs/v1.1/Docs/Customization/config.md

@@ -215,7 +215,7 @@ window.cnblogsConfig = {
 }
 ```
 
-日/夜间模式配置。
+日/夜间模式配置。页面使用日/夜间模式优先级：用户设置 > 自动切换 > 默认。
 
 ```javascript
 window.cnblogsConfig = {
@@ -669,6 +669,30 @@ window.cnblogsConfig = {
 }
 ```
 
+### essayCode - 代码框统一样式设置
+
+?> 版本 >= v1.2.9
+
+* 类型：```Object```
+* 默认值：
+
+```json
+{
+    fontFamily: "'Ubuntu Mono',monospace", // 代码框字体
+    fontSize: "14px" // 代码框字体大小
+}
+```
+
+代码框统一样式设置，目前只有字体设置，看需求后续可能会增加配置项。
+
+```javascript
+window.cnblogsConfig = {
+    essayCode: {
+        fontSize: "16px",
+    },
+}
+```
+
 ### 使用博客园默认代码样式
 
 #### essayCodeHighlightingType
@@ -866,7 +890,7 @@ window.cnblogsConfig = {
 
 * 类型：```Boolean```
 * 相关文档：[版本映射](https://bndong.github.io/Cnblogs-Theme-SimpleMemory/v1.1/#/Docs/Guide/versionMapping)
-* 默认值：```"false"```
+* 默认值：```false```
 
 是否开启版本映射，默认关闭。
 

docs/v1.1/Docs/GettingStarted/install.md

@@ -71,13 +71,13 @@ CSS代码位置：```/src/style/base.min.css``` 拷贝此文件代码至页面
 ```html
 <script type="text/javascript">
     window.cnblogsConfig = {
-        GhVersions    : 'v1.2.8', // 版本
+        GhVersions    : 'v1.2.9', // 版本
         blogUser      : "userName", // 用户名
         blogAvatar    : "https://xxxx.png", // 用户头像
         blogStartDate : "2016-11-17", // 入园时间，年-月-日。入园时间查看方法：鼠标停留园龄时间上，会显示入园时间
     }
 </script>
-<script src="https://cdn.jsdelivr.net/gh/BNDong/[email protected].8/src/script/simpleMemory.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/BNDong/[email protected].9/src/script/simpleMemory.min.js"></script>
 ```
 
 !> 注意：引入的文件 simpleMemory.min.js 版本需要与配置 window.cnblogsConfig.GhVersions 一致！

docs/v1.1/Docs/changelog.md

@@ -1,3 +1,14 @@
+## 2020.04.06 - v1.2.9
+* 增加夜间模式样式适配
+* 现在夜间模式可以保存用户选择的状态了（4小时）
+* 加快顶部底部跳转的速度
+* 调整了文章标题样式结构
+* 现在点击文章目录不会更改页面 URL 了
+* 代码字体配置：```essayCode```
+* 新的评论样式
+* 更新基础 css 文件
+* 修复了 v1.2.8 版本配置代码高度限制不生效的问题
+
 ## 2020.03.24 - v1.2.8
 * 统一代码框、行内代码字体
 * 统一代码框圆角大小、字体大小

src/script/articleTitle.js

@@ -1,6 +1,7 @@
 $(document).ready(function () {
     const cparent = 'cnblogs_post_body',
-          s       = $('#' + cparent);
+          s       = $('#' + cparent),
+          tools   = new myTools;
 
     if (s.length === 0) return;
     const h = s.find(':header');
@@ -28,7 +29,8 @@ $(document).ready(function () {
     }
 
     function setTh1(th1) {
-        var th1Text = HTMLEncode(th1.text());
+        th1.attr('tid', 'tid-' + tools.randomString(6));
+        var th1Text = tools.HTMLEncode(th1.text());
 
         if (!th1set) th1set = true;
 
@@ -56,8 +58,8 @@ $(document).ready(function () {
     }
 
     function setTh2(th2, index) {
-
-        var th2Text = HTMLEncode(th2.text());
+        th2.attr('tid', 'tid-' + tools.randomString(6));
+        var th2Text = tools.HTMLEncode(th2.text());
 
         th2.wrap('<span title-type="h2" class="header__span"></span>');
         th2.text('');
@@ -99,15 +101,4 @@ $(document).ready(function () {
             }
         ) ;
     }
-
-    /**
-     * @return {string}
-     */
-    function HTMLEncode(html) {
-        var temp = document.createElement("div");
-        (temp.textContent != null) ? (temp.textContent = html) : (temp.innerText = html);
-        var output = temp.innerHTML;
-        temp = null;
-        return output;
-    }
 });

src/script/base.js

@@ -311,9 +311,9 @@ function Base() {
                     if (ac === 'down') {
                         var docHeight    = $(document).height();
                         var windowHeight = $(window).height();
-                        tools.actScroll(docHeight - windowHeight, 2000)
+                        tools.actScroll(docHeight - windowHeight, 900)
                     } else {
-                        tools.actScroll(0, 2000)
+                        tools.actScroll(0, 900)
                     }
                 }
             }
@@ -410,12 +410,21 @@ function Base() {
      * 日/夜间模式控制
      */
     this.setDayNightControl = function () {
-        var h = parseInt(new Date().getHours()),head = $('head'),
-            daySwitch = window.cnblogsConfig.switchDayNight.auto.enable ?
-            (h >= window.cnblogsConfig.switchDayNight.auto.nightHour ? '' :
-                    (h >= window.cnblogsConfig.switchDayNight.auto.dayHour ? 'daySwitch' : '')
-            ) : 'daySwitch',
-           html = '<div id="dayNightSwitch" class="generalWrapper">' +
+        var h = parseInt(new Date().getHours()),head = $('head'), cookieKey = 'cnblogs_config_isNight', exp  =  4 * 3600, daySwitch;
+
+        switch (tools.getCookie(cookieKey)) {
+            case 'day':
+                daySwitch = 'daySwitch'; break;
+            case 'night':
+                daySwitch = ''; break;
+            default:
+                daySwitch = window.cnblogsConfig.switchDayNight.auto.enable ?
+                    (h >= window.cnblogsConfig.switchDayNight.auto.nightHour ? '' :
+                            (h >= window.cnblogsConfig.switchDayNight.auto.dayHour ? 'daySwitch' : '')
+                    ) : 'daySwitch'; break;
+        }
+
+        var html = '<div id="dayNightSwitch" class="generalWrapper">' +
             '    <div class="onOff '+ daySwitch +'">' +
             '        <div class="star star1"></div>' +
             '        <div class="star star2"></div>' +
@@ -437,10 +446,12 @@ function Base() {
         if (!daySwitch) head.append('<link type="text/css" id="baseDarkCss" rel="stylesheet" href="'+getJsDelivrUrl('base.dark.css')+'">');
 
         $('#dayNightSwitch .onOff').click(function () {
-            if ($(this).hasClass('daySwitch')) {
+            if ($(this).hasClass('daySwitch')) { // 夜间
+                tools.setCookie(cookieKey, 'night', exp);
                 $(this).removeClass('daySwitch');
                 head.append('<link type="text/css" id="baseDarkCss" rel="stylesheet" href="'+getJsDelivrUrl('base.dark.css')+'">');
-            } else {
+            } else { // 日间
+                tools.setCookie(cookieKey, 'day', exp);
                 $(this).addClass('daySwitch');
                 $('head link#baseDarkCss').remove();
             }
@@ -1215,8 +1226,6 @@ function Base() {
             hltype    = window.cnblogsConfig.essayCodeHighlightingType.toLowerCase(),
             hltheme   = window.cnblogsConfig.essayCodeHighlighting.toLowerCase();
 
-        if (window.cnblogsConfig.codeMaxHeight) pre.css('max-height', '70vh');
-
         switch (hltype) {
             case 'highlightjs':
                 setCodeBefore(1);
@@ -1324,7 +1333,10 @@ function Base() {
         }
 
         function setCodeBefore(type) {
-            pre.css('cssText', "font-family:'Ubuntu Mono',monospace !important; font-size: 14px !important;");
+            var cssText = "font-family:"+ window.cnblogsConfig.essayCode.fontFamily +" !important; font-size: "+ window.cnblogsConfig.essayCode.fontSize +" !important;";
+            if (window.cnblogsConfig.codeMaxHeight) cssText += 'max-height: 70vh;';
+            pre.css('cssText', cssText);
+
             $.each(pre, function (i) {
                 var obj = $(this), pid = 'pre-' + tools.randomString(6), codeLine, html = '';
 
@@ -1385,72 +1397,42 @@ function Base() {
     };
 
     /**
-     * 设置评论框样式
+     * 设置评论样式
      */
     this.setCommentStyle = function() {
-
-        var commentList        = $('.blog_comment_body[id!=tbCommentBodyPreviewBody]'),
-            commentPlaceholder = $('#blog-comments-placeholder');
-
-        $('#comment_form_container .comment_textarea').css({
-            width:'100%',
-            height: '100%'
-        });
-
-        commentAvatar(commentList);
-        commentList.addClass('hvr-bob');
-
-        //气泡效果
         timeIds.commentTId = window.setInterval(function(){
-                if (commentPlaceholder.html() != '' || $("#comments_pager_bottom").length > 0) {
-                    CommentBubble();
-                    bndongJs.clearIntervalTimeId(timeIds.commentTId);
-                }
-            },1000);
-
-        function commentAvatar(commentList) {
-            commentList.each(function (i) {
-                var p    = $(commentList[i]).attr('id').split('_'),
-                    html = '';
-                if (p.length > 0) {
-                    var idIndex = p.length - 1;
-                    var id = p[idIndex];
-                    var idTmp = id.toString().match(/[0-9]/g);
-                    if ($.isArray(idTmp)) id = idTmp.join('');
-                    var op = $('#comment_'+id+'_avatar');
-                    if (op.length > 0 && op.text() != '') {
-                        var patch = op.text();
-                        html += '<img class="comment-avatar" src="'+patch+'"/>';
-                    } else {
-                        html += '<img class="comment-avatar" src="https://cdn.jsdelivr.net/gh/BNDong/Cnblogs-Theme-SimpleMemory@master/img/webp/default_avatar.webp"/>';
+            if ($('.feedbackItem').length > 0) {
+                setComment();
+                bndongJs.clearIntervalTimeId(timeIds.commentTId);
+            }
+        },1000);
+        
+        function setComment() {
+            var feedbackItem = $('.feedbackItem');
+            if (feedbackItem.length > 0) {
+                $.each(feedbackItem, function (i) {
+                    var obj = $(this), feedbackCon =  obj.find('.feedbackCon'), feedbackListSubtitle = obj.find('.feedbackListSubtitle'),
+                        commentBody = feedbackCon.length ? feedbackCon.find('.blog_comment_body') : [], avatarHtml = '',
+                        idInfo = commentBody.length ? commentBody.attr('id').split('_') : undefined;
+                    if (idInfo && idInfo.length > 0) {
+                        var id = idInfo[idInfo.length - 1], idTmp = id.toString().match(/[0-9]/g);
+                        if ($.isArray(idTmp)) id = idTmp.join('');
+                        var op = $('#comment_' + id + '_avatar'), patch  = op.length > 0 ? $.trim(op.text())
+                            : 'https://cdn.jsdelivr.net/gh/BNDong/Cnblogs-Theme-SimpleMemory@master/img/webp/default_avatar.webp';
+                        var ac = $('#a_comment_author_' + id), ah = ac.length ? ac.attr('href') : 'javascropt:void(0);';
+                        avatarHtml = '<div class="feedbackAvatar"><a href="' + ah + '" target="_blank"><img src="'+patch+'"/></a></div>';
+                        obj.prepend(avatarHtml);
                     }
-                    $(commentList[i]).before(html);
-                }
-            });
-        }
-
-        function CommentBubble() {
-            var w1 = '<div class="list">' +
-                '<table class="out" border="0" cellspacing="0" cellpadding="0"> ' +
-                '<tr>' +
-                '<td align="left" valign="bottom" class="q">' +
-                '<table border="0" cellpadding="0" cellspacing="0" style=""> ' +
-                '<tr><td class="topleft"></td><td class="top"></td><td class="topright"></td></tr> ' +
-                '<tr><td class="left"></td> <td align="left" class="conmts"><p>';
-
-
-            var w2 = '</p> </td> <td class="right"></td></tr> ' +
-                '<tr><td class="bottomleft"></td><td class="bottom"></td><td class="bottomright"></td></tr> ' +
-                '</table>' +
-                '</td> ' +
-                '</tr> ' +
-                '</table> ' +
-                '</div>';
-
-            $.each($(".blog_comment_body"), function(i, t) {
-                $(t).html(w1 + $(t).html() + w2);
-            });
-            $(".louzhu").closest(".feedbackItem").find(".out").removeClass("out").addClass("inc");
+                    if (feedbackListSubtitle.length && feedbackListSubtitle.find('.louzhu').length) {
+                        feedbackListSubtitle.addClass('feedbackListSubtitle-louzhu');
+                    }
+                });
+                $(feedbackItem[0]).css('padding-top', '0');
+                $(feedbackItem[feedbackItem.length - 1]).css('padding-bottom', '0');
+                var cssText = "font-family:"+ window.cnblogsConfig.essayCode.fontFamily +" !important; font-size: "+ window.cnblogsConfig.essayCode.fontSize +" !important; border-radius: 5px;padding: 10px;";
+                if (window.cnblogsConfig.essayCodeHighlightingType === 'cnblogs') cssText +=  'color: #000;';
+                $('head').append('<style>.feedbackCon pre {'+cssText + 'background-color: ' + $('.postBody pre').css('background-color') + ' !important;'+'}</style>');
+            }
         }
     };
 

src/script/config.js

@@ -65,6 +65,9 @@ require.config({
         classie: {
             deps: ['snapSvg'],
         },
+        title: {
+            deps: ['tools'],
+        },
         main4: {
             deps: ['snapSvg','classie', 'css!'+getJsDelivrUrl('menu_bubble.css')]
         },
@@ -95,7 +98,7 @@ require.config({
         base: {
             deps: [
                 'tools',
-                'css!//at.alicdn.com/t/font_543384_nt78v73wgg8.css', // 阿里云字体图标
+                'css!//at.alicdn.com/t/font_543384_6z41jpa1ptb.css', // 阿里云字体图标
                 'css!'+getJsDelivrUrl('google-fonts.css'), // 谷歌字体
             ]
         },