コミット: 81f97796e37ccac655be04bfed1faa11647b0556 - pukiwiki-fork (git)

コミットメタ情報

• リビジョン: 81f97796e37ccac655be04bfed1faa11647b0556 (tree)
• 日時: 2017-09-27 04:53:51
• 作者: umorigu <umorigu@gmai...>
• コミッター: umorigu

ログメッセージ

Improve encode_hint handling

変更サマリ

• modified: lib/html.php
• modified: plugin/search2.inc.php
• modified: skin/search2.js

差分

--- a/lib/html.php
+++ b/lib/html.php
@@ -206,7 +206,7 @@ function get_html_scripting_data()
 	if (!isset($ticket_link_sites) || !is_array($ticket_link_sites)) {
 		return '';
 	}
-	$is_utf8 = SOURCE_ENCODING === 'UTF-8';
+	$is_utf8 = (bool)defined('PKWK_UTF8_ENABLE');
 	// Require: PHP 5.4+
 	$json_enabled = defined('JSON_UNESCAPED_UNICODE');
 	if (!$json_enabled) {

--- a/plugin/search2.inc.php
+++ b/plugin/search2.inc.php
@@ -218,7 +218,7 @@ EOD;
 <noscript>
  <p>$_msg_unsupported_webbrowser $alt_msg</p>
 </noscript>
-<p class="_plugin_search2_nosupport_message" style="display:block;">
+<p class="_plugin_search2_nosupport_message" style="display:none;">
   $_msg_unsupported_webbrowser $alt_msg
 </p>
 <form action="$script" method="GET" class="_plugin_search2_form">

--- a/skin/search2.js
+++ b/skin/search2.js
@@ -304,7 +304,7 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
             // Remove this line from search target
             continue;
           } else if (line.match(/^#freeze(\W|$)/)) {
-            // Stil in header
+            // Still in header
           } else {
             // Already in body
             isInAuthorHeader = false;
@@ -343,7 +343,6 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
         }
       }
       return blocks;
-      //return foundLines.join('\n');
     }
     function getSummary(bodyText, searchRegex) {
       return getTargetLines(bodyText, searchRegex);
@@ -392,10 +391,17 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
       return summary.join(' ').substring(0, 150);
     }
     function removeEncodeHint() {
-      var form = document.querySelector('form');
-      if (form && form.encode_hint && (typeof form.encode_hint.removeAttribute === 'function')) {
-        form.encode_hint.removeAttribute('name');
-      }
+      // Remove 'encode_hint' if site charset is UTF-8
+      var props = getSiteProps();
+      if (!props.is_utf8) return;
+      var forms = document.querySelectorAll('form');
+      forEach(forms, function(form){
+        if (form.cmd && form.cmd.value === 'search2') {
+          if (form.encode_hint && (typeof form.encode_hint.removeAttribute === 'function')) {
+            form.encode_hint.removeAttribute('name');
+          }
+        }
+      });
     }
     function kickFirstSearch() {
       var form = document.querySelector('._plugin_search2_form');
@@ -436,12 +442,18 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
             forEach(f.querySelectorAll('input[name="base"]'), function(radio){
               if (radio.checked) base = radio.value;
             });
+            var props = getSiteProps();
             var loc = document.location;
-            var url = loc.protocol + '//' + loc.host + loc.pathname +
-              '?cmd=search2' +
+            var baseUri = loc.protocol + '//' + loc.host + loc.pathname;
+            if (props.base_uri_pathname) {
+              baseUri = props.base_uri_pathname;
+            }
+            var url = baseUri + '?' +
+              (props.is_utf8 ? '' : 'encode_hint=\u3077' + '&') +
+              'cmd=search2' +
               '&q=' + encodeSearchText(q) +
               (base ? '&base=' + encodeURIComponent(base) : '');
-              e.preventDefault();
+            e.preventDefault();
             setTimeout(function() {
               location.href = url;
             }, 1);
@@ -567,13 +579,18 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
       return false;
     }
     function isEnableServerFunctions() {
+      var props = getSiteProps();
+      if (props.json_enabled) return true;
+      return false;
+    }
+    function getSiteProps() {
+      var empty = {};
       var propsDiv = document.getElementById('pukiwiki-site-properties');
-      if (!propsDiv) return false;
+      if (!propsDiv) return empty;
       var jsonE = propsDiv.querySelector('div[data-key="site-props"]');
-      if (!jsonE) return false;
+      if (!jsonE) return emptry;
       var props = JSON.parse(jsonE.getAttribute('data-value'));
-      if (props.json_enabled) return true;
-      return false;
+      return props || empty;
     }
     colorSearchTextInBody();
     if (! isEnabledFetchFunctions()) {