BugTrack/2434 Improve props transfer on Searching

diff --git a/lib/html.php b/lib/html.php
index e77baf3..a05455a 100644 (file)
--- a/lib/html.php
+++ b/lib/html.php
@@ -239,9 +239,9 @@ EOS;
                'base_uri_pathname' => get_base_uri(PKWK_URI_ROOT),
                'base_uri_absolute' => get_base_uri(PKWK_URI_ABSOLUTE)
        );
-       $props_json = htmlsc(json_encode($props, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+       $h_props = htmlsc(json_encode($props, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
        $site_props = <<<EOS
-<div data-key="site-props" data-value="$props_json"></div>
+<input type="hidden" class="site-props" value="$h_props" />
 EOS;
        $h_plugin = htmlsc($plugin);
        $plugin_prop = <<<EOS

diff --git a/skin/search2.js b/skin/search2.js
index f764726..237c7d7 100644 (file)
--- a/skin/search2.js
+++ b/skin/search2.js
@@ -96,11 +96,9 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
     }
     function getSiteProps() {
       var empty = {};
-      var propsDiv = document.getElementById('pukiwiki-site-properties');
-      if (!propsDiv) return empty;
-      var jsonE = propsDiv.querySelector('div[data-key="site-props"]');
-      if (!jsonE) return empty;
-      var props = JSON.parse(jsonE.getAttribute('data-value'));
+      var propsE = document.querySelector('#pukiwiki-site-properties .site-props');
+      if (!propsE) return empty;
+      var props = JSON.parse(propsE.value);
       return props || empty;
     }
     /**