Optimize the behavior of back2top and a[role="button"]

theme-next · Oct 9, 2019 · 38dc1de · 1v9 · Oct 30, 2019 · 1v9
1 parent cec9b7e
commit 38dc1de
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 19 deletions.
diff --git 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
@@ -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
@@ -3,28 +3,21 @@
   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 {
       display: none;
     }
   }
 
-  &: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
@@ -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
@@ -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 {