From 38dc1de2cc43f0ff35fe17085cf8f80aaf14c987 Mon Sep 17 00:00:00 2001
From: StevenJoeZhang <1119186082@qq.com>
Date: Wed, 9 Oct 2019 13:17:04 +0800
Subject: [PATCH] Optimize the behavior of back2top and a[role="button"]

---
 layout/_partials/header/menu.swig             |  2 +-
 layout/_partials/widgets.swig                 |  2 +-
 .../components/back-to-top-sidebar.styl       | 19 ++++++-------------
 source/js/bookmark.js                         |  3 +--
 source/js/local-search.js                     |  3 +--
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/layout/_partials/header/menu.swig b/layout/_partials/header/menu.swig
index 479b9cdfc2..2773869616 100644
--- a/layout/_partials/header/menu.swig
+++ b/layout/_partials/header/menu.swig
@@ -23,7 +23,7 @@
 
     {%- if hasSearch %}
       <li class="menu-item menu-item-search">
-        <a href="javascript:;" class="popup-trigger">
+        <a role="button" class="popup-trigger">
         {%- if theme.menu_settings.icons %}
           <i class="fa fa-search fa-fw"></i>{#
         #}{%- endif %}{#
diff --git a/layout/_partials/widgets.swig b/layout/_partials/widgets.swig
index 9d7c9a8d43..09658d440b 100644
--- a/layout/_partials/widgets.swig
+++ b/layout/_partials/widgets.swig
@@ -8,7 +8,7 @@
   <div class="reading-progress-bar"></div>
 {%- endif %}
 {%- if theme.bookmark.enable %}
-  <a class="book-mark-link book-mark-link-fixed" href="#"></a>
+  <a role="button" class="book-mark-link book-mark-link-fixed"></a>
 {%- endif %}
 {%- if theme.github_banner.enable %}
   {%- set github_URL = theme.github_banner.permalink %}
diff --git a/source/css/_common/components/back-to-top-sidebar.styl b/source/css/_common/components/back-to-top-sidebar.styl
index 5d81e34141..dfb9d7113b 100644
--- a/source/css/_common/components/back-to-top-sidebar.styl
+++ b/source/css/_common/components/back-to-top-sidebar.styl
@@ -3,9 +3,9 @@
   cursor: pointer;
   font-size: $b2t-font-size;
   margin: 20px - $sidebar-offset -10px -20px;
-  opacity: $b2t-opacity;
+  opacity: 0;
   text-align: center;
-  visibility: hidden;
+  the-transition();
 
   if (!hexo-config('back2top.scrollpercent')) {
     span {
@@ -13,18 +13,11 @@
     }
   }
 
-  &:hover {
-    opacity: $b2t-opacity-hover;
-  }
+  &.back-to-top-on {
+    opacity: $b2t-opacity;
 
-  +tablet-mobile() {
-    if (!hexo-config('sidebar.onmobile')) {
-      display: none;
+    &:hover {
+      opacity: $b2t-opacity-hover;
     }
   }
-
-  &.back-to-top-on {
-    visibility: visible;
-    the-transition();
-  }
 }
diff --git a/source/js/bookmark.js b/source/js/bookmark.js
index c36ca44520..ba800472fd 100644
--- a/source/js/bookmark.js
+++ b/source/js/bookmark.js
@@ -36,8 +36,7 @@ window.addEventListener('DOMContentLoaded', () => {
       window.addEventListener('pjax:send', doSaveScroll);
     }
     // Save the position by clicking the icon
-    link.addEventListener('click', event => {
-      event.preventDefault();
+    link.addEventListener('click', () => {
       doSaveScroll();
       window.anime({
         targets : link,
diff --git a/source/js/local-search.js b/source/js/local-search.js
index e2bc55e3e2..08c050888e 100644
--- a/source/js/local-search.js
+++ b/source/js/local-search.js
@@ -292,8 +292,7 @@ window.addEventListener('DOMContentLoaded', () => {
   }
 
   // Handle and trigger popup window
-  document.querySelector('.popup-trigger').addEventListener('click', event => {
-    event.stopPropagation();
+  document.querySelector('.popup-trigger').addEventListener('click', () => {
     if (isfetched === false) {
       searchFunc();
     } else {