Release v1.1.8

Author: BNDong

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

@@ -696,6 +696,30 @@ prettify、desert、sunburst、obsidian、doxy
 
 ## 页脚配置
 
+### footerStyle - 页脚样式
+
+?> 版本 >= v1.1.8
+
+* 类型：```Int```
+* 默认值：```2```
+
+页脚样式：
+
+footerStyle: 1
+
+![footer_01](../../Images/footer_01.png)
+
+footerStyle: 2
+
+![footer_02](../../Images/footer_02.png)
+
+```javascript
+window.cnblogsConfig = {
+    footerStyle: 1
+}
+```
+
+
 ### bottomBlogroll - 友情链接
 
 * 类型：```Array```

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

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

docs/v1.1/Docs/Guide/menuData.md

@@ -19,6 +19,10 @@
 - 日历
 - 文章档案
 
+**v1.1.8 新增**
+
+- 积分与排名
+
 ## 支持数据不显示的调试方法
 
 ### 开启对应显示设置

docs/v1.1/Images/footer_01.png

@@ -79,7 +79,7 @@ $(document).ready(function(){
     // 设置关于作者
     var aboutHtml = window.cnblogsConfig.essaySuffix.aboutHtml
         ? window.cnblogsConfig.essaySuffix.aboutHtml
-        : '热爱生活，爱读书/旅游，喜欢技术，乐于专研。评论和私信会在第一时间回复。或者<a href="https://msg.cnblogs.com/msg/send/'+tmp[3]+'" target="_blank">直接私信</a>我。';
+        : '热爱生活，爱读书/旅游，乐于专研。评论和私信会在第一时间回复。或者<a href="https://msg.cnblogs.com/msg/send/'+tmp[3]+'" target="_blank">直接私信</a>我。';
 
     bottom_html += '<span class="essaySuffix-right-title">关于博主</span>：' + aboutHtml + '<br>';
 

docs/v1.1/Images/footer_02.png

@@ -28,7 +28,7 @@ $(document).ready(function () {
     }
 
     function setTh1(th1) {
-        var th1Text = th1.text();
+        var th1Text = HTMLEncode(th1.text());
 
         if (!th1set) th1set = true;
 
@@ -57,7 +57,7 @@ $(document).ready(function () {
 
     function setTh2(th2, index) {
 
-        var th2Text = th2.text();
+        var th2Text = HTMLEncode(th2.text());
 
         th2.wrap('<span title-type="h2" class="header__span"></span>');
         th2.text('');
@@ -99,4 +99,15 @@ $(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/TweenMax_MyTween.min.js

@@ -16,6 +16,7 @@ function Base() {
             setMenuIntroduceTId    : null, // 菜单设置-个人信息定时器ID
             setMenuCalendarTId     : null, // 菜单设置-日历定时器ID
             setSidebarSearchTId    : null, // 菜单设置-找找看定时器ID
+            setSidebarScorerankTId : null, // 菜单设置-积分与排名定时器ID
             setMenuSidebarTId      : null, // 菜单设置-最新随笔定时器ID
             setMenuToptagsTId      : null, // 菜单设置-我的标签定时器ID
             setMenuClassifyTId     : null, // 菜单设置-随笔分类定时器ID
@@ -96,6 +97,7 @@ function Base() {
         timeIds.setMenuIntroduceTId    = window.setInterval( setMenuData.setIntroduce, 1000 );
         timeIds.setMenuCalendarTId     = window.setInterval( setMenuData.setCalendar, 1000 );
         timeIds.setSidebarSearchTId    = window.setInterval( setMenuData.setSidebarSearch, 1000 );
+        timeIds.setSidebarScorerankTId = window.setInterval( setMenuData.setSidebarScorerank, 1000 );
         timeIds.setMenuSidebarTId      = window.setInterval( setMenuData.setSidebar, 1000 );
         timeIds.setMenuToptagsTId      = window.setInterval( setMenuData.setToptags, 1000 );
         timeIds.setMenuClassifyTId     = window.setInterval( setMenuData.setClassify, 1000 );
@@ -383,6 +385,7 @@ function Base() {
             calendar         = $('#blog-calendar'),               // 日历
             calendarTable    = $('#blogCalendar'),                // 日历
             sidebarSearch    = $('#sidebar_search_box'),          // 找找看
+            scorerank        = $('#sidebar_scorerank ul li'),     // 积分与排名
             sidebar          = $('#sidebar_recentposts ul li'),   // 最新随笔
             toptags          = $('#sidebar_toptags ul li'),       // 我的标签
             sbClassify       = $('#sidebar_postcategory ul li'),  // 随笔分类
@@ -392,6 +395,7 @@ function Base() {
             topDiggPosts     = $('#TopDiggPostsBlock ul li'),     // 推荐排行
             menuIntroduce    = $('#introduce'),
             menuCalendar     = $('#calendar-box'),
+            menuScorerank    = $('#sb-sidebarScorerank'),
             menuSearchBox    = $('#sb-sidebarSearchBox'),
             menuArticle      = $('#sb-articlearchive'),
             menuSidebar      = $('#sb-sidebarRecentposts'),
@@ -428,6 +432,14 @@ function Base() {
             }
         }
 
+        // 添加积分与排名
+        function setSidebarScorerank() {
+            if (scorerank.length > 0 && menuScorerank.html() === ''){
+                menuScorerank.html(getMenuData(scorerank, 'icon-collection_fill')).prev('.m-list-title').show();
+                bndongJs.clearIntervalTimeId(timeIds.setSidebarScorerankTId);
+            }
+        }
+
         // 添加最新随笔
         function setSidebar() {
             if (sidebar.length > 0 && menuSidebar.html() === ''){
@@ -513,8 +525,8 @@ function Base() {
                 if (ret.test(textArr[0])) textArr.splice(0,1);
                 var text = $.trim(textArr.join('.')),
                     iconHtml = '<span class="iconfont '+icon+'" style="color: #888;font-size: 14px;margin-right: 5px;"></span>';
-                o.html(iconHtml + text);
-                html += '<li>' + o.prop("outerHTML") + '</li>';
+                o.length > 0 && o.html(iconHtml + text);
+                html += '<li>' + (o.length > 0 ?  o.prop("outerHTML") : "<a href='javascript:void(0);'>" + iconHtml + text + "</a>") + '</li>';
             });
             html += '</ul></div>';
             return html;
@@ -524,6 +536,7 @@ function Base() {
             setIntroduce: setIntroduce,
             setCalendar: setCalendar,
             setSidebarSearch: setSidebarSearch,
+            setSidebarScorerank: setSidebarScorerank,
             setSidebar: setSidebar,
             setToptags: setToptags,
             setClassify: setClassify,
@@ -551,8 +564,11 @@ function Base() {
      * 添加页脚
      */
     this.addFooter = function() {
-        const footer = $('#footer');
-        var pvHtml = '';
+        const footer = $('#footer'),
+              rHref  = 'https://github.com/'+window.cnblogsConfig.GhUserName+'/'+window.cnblogsConfig.GhRepositories+'/tree/'+window.cnblogsConfig.CnVersions,
+              lHref  = 'https://github.com/'+window.cnblogsConfig.GhUserName+'/'+window.cnblogsConfig.GhRepositories+'/tree/'+window.cnblogsConfig.GhVersions;
+
+        var pvHtml   = '', bgFooter = '';
 
         if (window.cnblogsConfig.bottomText.left || window.cnblogsConfig.bottomText.right)
             pvHtml += '<div>【'+window.cnblogsConfig.bottomText.left+'<span id="footerTextIcon">'+window.cnblogsConfig.bottomText.icon+'</span>'+window.cnblogsConfig.bottomText.right+'】</div>';
@@ -562,28 +578,71 @@ function Base() {
             '<div id="cnzzInfo"></div>' +
             '<div id="themeInfo"></div>';
 
-        var bgFooter = '<footer>' +
-            '<footer-background>' +
-            '<figure class="clouds"></figure>' +
-            '<figure class="background"></figure>' +
-            '<figure class="foreground"></figure>' +
-            '<figure class="poof"></figure>' +
-            '</footer-background>' +
-            '</footer>',
+        switch (parseInt(window.cnblogsConfig.footerStyle)) {
+            case 1:
+                init_t1();
+                break;
 
-        rHref = 'https://github.com/'+window.cnblogsConfig.GhUserName+'/'+window.cnblogsConfig.GhRepositories+'/tree/'+window.cnblogsConfig.CnVersions,
-        lHref = 'https://github.com/'+window.cnblogsConfig.GhUserName+'/'+window.cnblogsConfig.GhRepositories+'/tree/'+window.cnblogsConfig.GhVersions;
+            case 2:
+            default:
+                init_t2();
+                break;
+        }
 
-        addFooterHtml();
         setBlogroll();
         setTheme();
         window.setInterval( setRunTime, 500 );
         timeIds.setCnzzTId = window.setInterval( setCnzz, 1000 );
 
+        // v1.0 页脚
+        function init_t1() {
+            pvHtml = '<div class="footer-image"></div>' + pvHtml;
+            addFooterHtml();
+            $('#footer').css({
+                'min-height': '130px',
+                '_height': '15px',
+                'position': 'absolute',
+                'margin': '200px 0 0 0',
+                'left': '0',
+                'right': '0',
+                'background': '#232323',
+                'padding': '17px 0 27px',
+                'text-align': 'center',
+                'color': '#888',
+                'font-size': '12px',
+                'line-height': '1.5',
+            });
+
+            $('.footer-image').css({
+                'background': 'url(https://raw.githubusercontent.com/BNDong/Cnblogs-Theme-SimpleMemory/master/img/footer.png) no-repeat 50%',
+                'height': '368px',
+                'z-index': '1',
+                'position': 'absolute',
+                'bottom': '100px',
+                'width': '100%',
+                'pointer-events': 'none'
+            });
+        }
+
+        // v1.1+ 页脚
+        function init_t2() {
+
+            bgFooter = '<footer>' +
+                '<footer-background>' +
+                '<figure class="clouds"></figure>' +
+                '<figure class="background"></figure>' +
+                '<figure class="foreground"></figure>' +
+                '<figure class="poof"></figure>' +
+                '</footer-background>' +
+                '</footer>';
+
+            addFooterHtml();
+        }
+
         // 添加页脚
         function addFooterHtml() {
             const poweredby = $('#poweredby');
-            footer.prepend(bgFooter);
+            bgFooter && footer.prepend(bgFooter);
             if (poweredby.length > 0) {
                 poweredby.before(pvHtml);
             } else {
@@ -908,7 +967,7 @@ function Base() {
         $('#cb_post_title_url').addClass('post-del-title');
 
         if (window.cnblogsConfig.essayTopAnimationRendered)
-            require(['TweenMax', 'MyTween'], function() {
+            require(['TweenMax_MyTween'], function() {
                 $('#notHomeTopCanvas').css({
                     'margin': 'auto',
                     'width': '100%',
@@ -927,7 +986,7 @@ function Base() {
      * 设置图片灯箱效果
      */
     this.baguetteBox = function () {
-        require(['baguetteBox', 'marvin', 'articleStatement'], function(baguetteBox) {
+        require(['baguetteBox', 'title_marvin_articleStatement'], function(baguetteBox) {
 
             // 设置图片点击查看
             const cpb    = $('#cnblogs_post_body')

src/script/articleStatement.js

@@ -49,6 +49,14 @@ require.config({
         tools: setFileNameMin('tools', 'js'),
         //-- base
         base: setFileNameMin('base', 'js'),
+
+        // == 合并压缩文件 == //
+        //-- 菜单滚动条 && 进度条 && 旋转
+        optiscroll_ToProgress_rotate: setFileNameMin('optiscroll_ToProgress_rotate.min', 'js'),
+        //-- 文章标题 && 文章目录 && 文章后缀
+        title_marvin_articleStatement: setFileNameMin('title_marvin_articleStatement.min', 'js'),
+        //-- 非主页头图动画
+        TweenMax_MyTween: setFileNameMin('TweenMax_MyTween.min', 'js'),
     },
     shim:{
         optiscroll: {
@@ -91,6 +99,14 @@ require.config({
                 'css!'+getJsDelivrUrl('footer.css'),
                 'css!https://at.alicdn.com/t/font_543384_ezv3l7gd9r7.css', // 阿里云字体图标
             ]
-        }
+        },
+
+        // == 合并压缩文件 == //
+        optiscroll_ToProgress_rotate: {
+            deps: ['css!'+getJsDelivrUrl('optiscroll.css')]
+        },
+        title_marvin_articleStatement: {
+            deps: ['bootstrap', 'css!'+getJsDelivrUrl('marvin.nav2.css')]
+        },
     }
 });