From cece4e6d3ded5d1d392d5ad6ee53930f0c0d7d87 Mon Sep 17 00:00:00 2001
From: yscoder <634206017@qq.com>
Date: Fri, 25 Nov 2016 13:35:19 +0800
Subject: [PATCH] fix point through the mask

---
 _config.yml                          |  2 +-
 layout/_partial/google-analytics.ejs |  2 +-
 package.json                         |  2 +-
 scripts/plugins.js                   |  4 +---
 source/css/_partial/article.less     | 17 ++++++++++++++++
 source/js/main.js                    | 30 +++++++++++++++-------------
 source/js/main.min.js                |  2 +-
 7 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/_config.yml b/_config.yml
index 4cd6d53a..3955967d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,6 +1,6 @@
 # hexo-theme-indigo
 # https://github.com/yscoder/hexo-theme-indigo
-version: 1.2.6
+version: 1.2.7
 
 #添加新菜单项遵循以下规则
 # menu:
diff --git a/layout/_partial/google-analytics.ejs b/layout/_partial/google-analytics.ejs
index 84e75f04..295cd3a4 100644
--- a/layout/_partial/google-analytics.ejs
+++ b/layout/_partial/google-analytics.ejs
@@ -1,6 +1,6 @@
 <% if (theme.google_analytics){ %>
 <!-- Google Analytics -->
-<script type="text/javascript">
+<script>
 (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
 (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
diff --git a/package.json b/package.json
index 0e7e1eeb..03a60cef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-material-indigo",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "Material Design theme for Hexo.",
   "keywords": [
     "hexo",
diff --git a/scripts/plugins.js b/scripts/plugins.js
index a1937f3a..86d61359 100644
--- a/scripts/plugins.js
+++ b/scripts/plugins.js
@@ -1,6 +1,4 @@
-hexo.extend.tag.register('image', function (args) {
-    const src = args[0]
-    const title = args[1]
+hexo.extend.tag.register('image', ([src, title]) => {
     return `<figure class="image-bubble">
                 <img src="${src}" alt="${title}">
                 <div class="image-caption">${title}</div>
diff --git a/source/css/_partial/article.less b/source/css/_partial/article.less
index 8c0174e5..17e40473 100644
--- a/source/css/_partial/article.less
+++ b/source/css/_partial/article.less
@@ -194,9 +194,14 @@
     line-height: 1.8;
 
     .highlight,
+    .image-bubble,
     > pre {
         margin-left: -35px;
         margin-right: -35px;
+    }
+
+    .highlight,
+    > pre {
         padding: 20px 35px;
     }
 
@@ -515,6 +520,18 @@
     .has-jax {
         font-size: 10px;
     }
+    .post-content {
+        .highlight,
+        .image-bubble,
+        > pre {
+            margin-left: -16px;
+            margin-right: -16px;
+        }
+        .highlight,
+        > pre {
+            padding: 16px;
+        }
+    }
 }
 
 .duoshuo {
diff --git a/source/js/main.js b/source/js/main.js
index c3870cd0..d90d8275 100644
--- a/source/js/main.js
+++ b/source/js/main.js
@@ -16,8 +16,8 @@
         forEach = Array.prototype.forEach,
         even = ('ontouchstart' in w && /Mobile|Android|iOS|iPhone|iPad|iPod|Windows Phone|KFAPWI/i.test(navigator.userAgent)) ? 'touchstart' : 'click',
         isWX = /micromessenger/i.test(navigator.userAgent),
-        noop = function() {},
-        offset = function(el) {
+        noop = function () { },
+        offset = function (el) {
             var x = el.offsetLeft,
                 y = el.offsetTop;
 
@@ -56,7 +56,7 @@
                 gotop.classList.remove('in');
             }
         },
-        toggleMenu: function(flag) {
+        toggleMenu: function (flag) {
             var main = $('#main');
             if (flag) {
                 menu.classList.remove('hide');
@@ -65,7 +65,7 @@
                     mask.classList.add('in');
                     menu.classList.add('show');
 
-                    if(isWX) {
+                    if (isWX) {
                         var top = docEl.scrollTop;
                         main.classList.add('lock');
                         main.scrollTop = top;
@@ -77,7 +77,7 @@
             } else {
                 menu.classList.remove('show');
                 mask.classList.remove('in');
-                if(isWX) {
+                if (isWX) {
                     var top = main.scrollTop;
                     main.classList.remove('lock');
                     docEl.scrollTop = top;
@@ -145,33 +145,29 @@
                 }
             }
         })(),
+        hideOnMask: [],
         modal: function (target) {
             this.$modal = $(target);
             this.$off = this.$modal.querySelector('.close');
 
             var _this = this;
 
-            function hideByBody(e) {
-                if (!_this.$modal.contains(e.target)) {
-                    _this.hide();
-                }
-            }
-
             this.show = function () {
                 mask.classList.add('in');
                 _this.$modal.classList.add('ready');
                 setTimeout(function () {
                     _this.$modal.classList.add('in');
-                    d.addEventListener(even, hideByBody);
                 }, 0)
             }
 
+            this.onHide = noop;
+
             this.hide = function () {
+                _this.onHide();
                 mask.classList.remove('in');
                 _this.$modal.classList.remove('in');
                 setTimeout(function () {
                     _this.$modal.classList.remove('ready');
-                    d.removeEventListener(even, hideByBody);
                 }, 300)
             }
 
@@ -179,6 +175,7 @@
                 return _this.$modal.classList.contains('in') ? _this.hide() : _this.show();
             }
 
+            Blog.hideOnMask.push(this.hide);
             this.$off && this.$off.addEventListener(even, this.hide);
         },
         share: function () {
@@ -201,6 +198,7 @@
             }
 
             var wxModal = new this.modal('#wxShare');
+            wxModal.onHide = shareModal.hide;
 
             forEach.call($$('.wxFab'), function (el) {
                 el.addEventListener(even, wxModal.toggle)
@@ -305,8 +303,12 @@
         menu.classList.add('hide');
     }, false);
 
-    mask.addEventListener(even, function () {
+    mask.addEventListener(even, function (e) {
         Blog.toggleMenu();
+        Blog.hideOnMask.forEach(function (hide) {
+            hide()
+        });
+        e.preventDefault();
     }, false);
 
     d.addEventListener('scroll', function () {
diff --git a/source/js/main.min.js b/source/js/main.min.js
index 520bfd7f..9a2e8b36 100644
--- a/source/js/main.min.js
+++ b/source/js/main.min.js
@@ -1 +1 @@
-(function(e,t){var n=t.body,a=t.querySelector.bind(t),o=t.querySelectorAll.bind(t),s=a("html"),r=a("#gotop"),l=a("#menu"),c=a("#header"),d=a("#mask"),f=a("#menu-toggle"),u=a("#menu-off"),v=a("#loading"),h=e.requestAnimationFrame,g=12,L=Array.prototype.forEach,m="ontouchstart"in e&&/Mobile|Android|iOS|iPhone|iPad|iPod|Windows Phone|KFAPWI/i.test(navigator.userAgent)?"touchstart":"click",p=/micromessenger/i.test(navigator.userAgent),x=function(){},y=function(e){var t=e.offsetLeft,i=e.offsetTop;if(e.offsetParent){var n=arguments.callee(e.offsetParent);t+=n.x,i+=n.y}return{x:t,y:i}},w=navigator.userAgent.indexOf("Firefox")!==-1?t.documentElement:n,E={goTop:function(e){var t=w.scrollTop,i=arguments.length>2?arguments[1]:Math.abs(t-e)/g;t&&t>e?(w.scrollTop=Math.max(t-i,0),h(arguments.callee.bind(this,e,i))):e&&t<e?(w.scrollTop=Math.min(t+i,e),h(arguments.callee.bind(this,e,i))):this.toc.actived(e)},toggleGotop:function(t){t>e.innerHeight/2?r.classList.add("in"):r.classList.remove("in")},toggleMenu:function(t){var i=a("#main");if(t){if(l.classList.remove("hide"),e.innerWidth<1241)if(d.classList.add("in"),l.classList.add("show"),p){var n=w.scrollTop;i.classList.add("lock"),i.scrollTop=n}else s.classList.add("lock")}else if(l.classList.remove("show"),d.classList.remove("in"),p){var n=i.scrollTop;i.classList.remove("lock"),w.scrollTop=n}else s.classList.remove("lock")},fixedHeader:function(e){e>c.clientHeight?c.classList.add("fixed"):c.classList.remove("fixed")},toc:function(){var e=a("#post-toc");if(!e||!e.children.length)return{fixed:x,actived:x};var t=y(e),n=t.y,s=c.clientHeight,r=a("#post-content").querySelectorAll("h1, h2, h3, h4, h5, h6");return e.querySelector('a[href="#'+r[0].id+'"]').parentNode.classList.add("active"),L.call(o('a[href^="#"]'),function(e){e.addEventListener("click",function(e){e.preventDefault();var t=y(a('[id="'+decodeURIComponent(this.hash).substr(1)+'"]')).y-s;h(E.goTop.bind(E,t))})}),{fixed:function(t){t>n-s?e.classList.add("fixed"):e.classList.remove("fixed")},actived:function(t){for(i=0,len=r.length;i<len;i++)if(t>y(r[i]).y-s-5){e.querySelector("li.active").classList.remove("active");var n=e.querySelector('a[href="#'+r[i].id+'"]').parentNode;n.classList.add("active")}t<y(r[0]).y&&(e.querySelector("li.active").classList.remove("active"),e.querySelector('a[href="#'+r[0].id+'"]').parentNode.classList.add("active"))}}}(),modal:function(e){function i(e){n.$modal.contains(e.target)||n.hide()}this.$modal=a(e),this.$off=this.$modal.querySelector(".close");var n=this;this.show=function(){d.classList.add("in"),n.$modal.classList.add("ready"),setTimeout(function(){n.$modal.classList.add("in"),t.addEventListener(m,i)},0)},this.hide=function(){d.classList.remove("in"),n.$modal.classList.remove("in"),setTimeout(function(){n.$modal.classList.remove("ready"),t.removeEventListener(m,i)},300)},this.toggle=function(){return n.$modal.classList.contains("in")?n.hide():n.show()},this.$off&&this.$off.addEventListener(m,this.hide)},share:function(){var e=a("#pageShare"),i=a("#shareFab"),n=new this.modal("#globalShare");a("#menuShare").addEventListener(m,n.toggle),i&&(i.addEventListener(m,function(){e.classList.toggle("in")},!1),t.addEventListener(m,function(t){!i.contains(t.target)&&e.classList.remove("in")},!1));var s=new this.modal("#wxShare");L.call(o(".wxFab"),function(e){e.addEventListener(m,s.toggle)})},search:function(){function e(){t.classList.toggle("in")}var t=a("#search-wrap");a("#search").addEventListener(m,e)},reward:function(){var e=new this.modal("#reward");a("#rewardBtn").addEventListener(m,e.toggle)},fixNavMinH:function(){function e(){t.style.minHeight=t.parentNode.clientHeight-t.nextElementSibling.offsetHeight+"px"}var t=a(".nav");return e}(),waterfall:function(){e.innerWidth<760||L.call(o(".waterfall"),function(e){var t=e.querySelectorAll(".waterfall-item"),i=[0,0];L.call(t,function(e){var t=i[0]<=i[1]?0:1;e.style.cssText="top:"+i[t]+"px;left:"+(t>0?"50%":0),i[t]+=e.offsetHeight}),e.style.height=Math.max(i[0],i[1])+"px",e.classList.add("in")})},tabBar:function(e){e.parentNode.parentNode.classList.toggle("expand")},page:function(){var e=o(".fade, .fade-scale");return{loaded:function(){L.call(e,function(e){e.classList.add("in")})},unload:function(){L.call(e,function(e){e.classList.remove("in")})}}}()};e.addEventListener("load",function(){E.fixNavMinH(),E.waterfall();var e=w.scrollTop;E.toc.fixed(e),E.toc.actived(e),v.classList.remove("active"),E.page.loaded()}),e.addEventListener("beforeunload",function(){E.page.unload()}),e.addEventListener("resize",function(){e.BLOG.even=m="ontouchstart"in e?"touchstart":"click",E.fixNavMinH(),E.toggleMenu(),E.waterfall()}),r.addEventListener(m,function(){h(E.goTop.bind(E,0))},!1),f.addEventListener(m,function(e){E.toggleMenu(!0),e.preventDefault()},!1),u.addEventListener(m,function(){l.classList.add("hide")},!1),d.addEventListener(m,function(){E.toggleMenu()},!1),t.addEventListener("scroll",function(){var e=w.scrollTop;E.toggleGotop(e),E.fixedHeader(e),E.toc.fixed(e),E.toc.actived(e)},!1),e.BLOG.SHARE&&E.share(),e.BLOG.REWARD&&E.reward(),E.docEl=w,E.noop=x,E.even=m,E.$=a,E.$$=o,Object.keys(E).reduce(function(e,t){return e[t]=E[t],e},e.BLOG),Waves.init(),Waves.attach(".global-share li",["waves-block"]),Waves.attach(".article-tag-list-link, #page-nav a, #page-nav span",["waves-button"])})(window,document);
\ No newline at end of file
+(function(e,t){var n=t.body,a=t.querySelector.bind(t),o=t.querySelectorAll.bind(t),s=a("html"),l=a("#gotop"),r=a("#menu"),c=a("#header"),d=a("#mask"),f=a("#menu-toggle"),u=a("#menu-off"),h=a("#loading"),v=e.requestAnimationFrame,g=12,L=Array.prototype.forEach,m="ontouchstart"in e&&/Mobile|Android|iOS|iPhone|iPad|iPod|Windows Phone|KFAPWI/i.test(navigator.userAgent)?"touchstart":"click",p=/micromessenger/i.test(navigator.userAgent),x=function(){},y=function(e){var t=e.offsetLeft,i=e.offsetTop;if(e.offsetParent){var n=arguments.callee(e.offsetParent);t+=n.x,i+=n.y}return{x:t,y:i}},w=navigator.userAgent.indexOf("Firefox")!==-1?t.documentElement:n,E={goTop:function(e){var t=w.scrollTop,i=arguments.length>2?arguments[1]:Math.abs(t-e)/g;t&&t>e?(w.scrollTop=Math.max(t-i,0),v(arguments.callee.bind(this,e,i))):e&&t<e?(w.scrollTop=Math.min(t+i,e),v(arguments.callee.bind(this,e,i))):this.toc.actived(e)},toggleGotop:function(t){t>e.innerHeight/2?l.classList.add("in"):l.classList.remove("in")},toggleMenu:function(t){var i=a("#main");if(t){if(r.classList.remove("hide"),e.innerWidth<1241)if(d.classList.add("in"),r.classList.add("show"),p){var n=w.scrollTop;i.classList.add("lock"),i.scrollTop=n}else s.classList.add("lock")}else if(r.classList.remove("show"),d.classList.remove("in"),p){var n=i.scrollTop;i.classList.remove("lock"),w.scrollTop=n}else s.classList.remove("lock")},fixedHeader:function(e){e>c.clientHeight?c.classList.add("fixed"):c.classList.remove("fixed")},toc:function(){var e=a("#post-toc");if(!e||!e.children.length)return{fixed:x,actived:x};var t=y(e),n=t.y,s=c.clientHeight,l=a("#post-content").querySelectorAll("h1, h2, h3, h4, h5, h6");return e.querySelector('a[href="#'+l[0].id+'"]').parentNode.classList.add("active"),L.call(o('a[href^="#"]'),function(e){e.addEventListener("click",function(e){e.preventDefault();var t=y(a('[id="'+decodeURIComponent(this.hash).substr(1)+'"]')).y-s;v(E.goTop.bind(E,t))})}),{fixed:function(t){t>n-s?e.classList.add("fixed"):e.classList.remove("fixed")},actived:function(t){for(i=0,len=l.length;i<len;i++)if(t>y(l[i]).y-s-5){e.querySelector("li.active").classList.remove("active");var n=e.querySelector('a[href="#'+l[i].id+'"]').parentNode;n.classList.add("active")}t<y(l[0]).y&&(e.querySelector("li.active").classList.remove("active"),e.querySelector('a[href="#'+l[0].id+'"]').parentNode.classList.add("active"))}}}(),hideOnMask:[],modal:function(e){this.$modal=a(e),this.$off=this.$modal.querySelector(".close");var t=this;this.show=function(){d.classList.add("in"),t.$modal.classList.add("ready"),setTimeout(function(){t.$modal.classList.add("in")},0)},this.onHide=x,this.hide=function(){t.onHide(),d.classList.remove("in"),t.$modal.classList.remove("in"),setTimeout(function(){t.$modal.classList.remove("ready")},300)},this.toggle=function(){return t.$modal.classList.contains("in")?t.hide():t.show()},E.hideOnMask.push(this.hide),this.$off&&this.$off.addEventListener(m,this.hide)},share:function(){var e=a("#pageShare"),i=a("#shareFab"),n=new this.modal("#globalShare");a("#menuShare").addEventListener(m,n.toggle),i&&(i.addEventListener(m,function(){e.classList.toggle("in")},!1),t.addEventListener(m,function(t){!i.contains(t.target)&&e.classList.remove("in")},!1));var s=new this.modal("#wxShare");s.onHide=n.hide,L.call(o(".wxFab"),function(e){e.addEventListener(m,s.toggle)})},search:function(){function e(){t.classList.toggle("in")}var t=a("#search-wrap");a("#search").addEventListener(m,e)},reward:function(){var e=new this.modal("#reward");a("#rewardBtn").addEventListener(m,e.toggle)},fixNavMinH:function(){function e(){t.style.minHeight=t.parentNode.clientHeight-t.nextElementSibling.offsetHeight+"px"}var t=a(".nav");return e}(),waterfall:function(){e.innerWidth<760||L.call(o(".waterfall"),function(e){var t=e.querySelectorAll(".waterfall-item"),i=[0,0];L.call(t,function(e){var t=i[0]<=i[1]?0:1;e.style.cssText="top:"+i[t]+"px;left:"+(t>0?"50%":0),i[t]+=e.offsetHeight}),e.style.height=Math.max(i[0],i[1])+"px",e.classList.add("in")})},tabBar:function(e){e.parentNode.parentNode.classList.toggle("expand")},page:function(){var e=o(".fade, .fade-scale");return{loaded:function(){L.call(e,function(e){e.classList.add("in")})},unload:function(){L.call(e,function(e){e.classList.remove("in")})}}}()};e.addEventListener("load",function(){E.fixNavMinH(),E.waterfall();var e=w.scrollTop;E.toc.fixed(e),E.toc.actived(e),h.classList.remove("active"),E.page.loaded()}),e.addEventListener("beforeunload",function(){E.page.unload()}),e.addEventListener("resize",function(){e.BLOG.even=m="ontouchstart"in e?"touchstart":"click",E.fixNavMinH(),E.toggleMenu(),E.waterfall()}),l.addEventListener(m,function(){v(E.goTop.bind(E,0))},!1),f.addEventListener(m,function(e){E.toggleMenu(!0),e.preventDefault()},!1),u.addEventListener(m,function(){r.classList.add("hide")},!1),d.addEventListener(m,function(e){E.toggleMenu(),E.hideOnMask.forEach(function(e){e()}),e.preventDefault()},!1),t.addEventListener("scroll",function(){var e=w.scrollTop;E.toggleGotop(e),E.fixedHeader(e),E.toc.fixed(e),E.toc.actived(e)},!1),e.BLOG.SHARE&&E.share(),e.BLOG.REWARD&&E.reward(),E.docEl=w,E.noop=x,E.even=m,E.$=a,E.$$=o,Object.keys(E).reduce(function(e,t){return e[t]=E[t],e},e.BLOG),Waves.init(),Waves.attach(".global-share li",["waves-block"]),Waves.attach(".article-tag-list-link, #page-nav a, #page-nav span",["waves-button"])})(window,document);
\ No newline at end of file