Commit: 303378153bd14e35b68d0b37f1fa3d62ebd2da05 - pukiwiki-fork (git)

Commit MetaInfo

• Revisão: 303378153bd14e35b68d0b37f1fa3d62ebd2da05 (tree)
• Hora: 2018-03-21 23:21:53
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Mensagem de Log

BugTrack/2434 Improve props transfer on Searching

Mudança Sumário

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

Diff

--- 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

--- 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;
     }
     /**