コミット: 06e9aa8418ee14e3db091607e0c3c7576be2673a - pukiwiki-fork (git)

コミットメタ情報

• リビジョン: 06e9aa8418ee14e3db091607e0c3c7576be2673a (tree)
• 日時: 2017-10-05 04:33:10
• 作者: umorigu <umorigu@gmai...>
• コミッター: umorigu

ログメッセージ

Color simple qwq

変更サマリ

• modified: skin/search2.js

差分

--- a/skin/search2.js
+++ b/skin/search2.js
@@ -286,13 +286,6 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
         var liHtml = '<a href="' + escapeHTML(href) + '">' + decoratedName + '</a> ' +
           getPassage(now, updatedAt);
         li.innerHTML = liHtml;
-        var a = li.querySelector('a');
-        if (a && a.hash) {
-          if (a.hash !== hash) {
-            // Some browser execute encodeHTML(hash) automatically. Support them.
-            a.href = val.url + '#encq=' + encodeSearchTextForHash(searchText);
-          }
-        }
         li.setAttribute('data-pagename', val.name);
         fragment.appendChild(li);
         var div = document.createElement('div');
@@ -724,7 +717,6 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
       return null;
     }
     function getSearchTextInLocationHash() {
-      // TODO Cross browser
       var hash = location.hash;
       if (!hash) return '';
       var q = '';
@@ -733,6 +725,10 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
       } else if (hash.substr(0, 6) === '#encq=') {
         q = decodeURIComponent(hash.substr(6).replace(/\+/g, ' '));
       }
+      var decodedQ = decodeURIComponent(q);
+      if (q !== decodedQ) {
+        q = decodedQ + ' OR ' + q;
+      }
       return q;
     }
     function colorSearchTextInBody() {