Commit: aeca84f13eb57ee3b3cc02cdf0952f330d81dca2 - pukiwiki-fork (git)

Commit MetaInfo

• Revision: aeca84f13eb57ee3b3cc02cdf0952f330d81dca2 (tree)
• Zeit: 2019-08-16 02:23:09
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2489 search2 plugin - Async search now refers $show_passage

Ändern Zusammenfassung

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

Diff

--- a/lib/html.php
+++ b/lib/html.php
@@ -227,6 +227,7 @@ function get_html_scripting_data($page, $in_editing)
 	global $external_link_cushion_page, $external_link_cushion;
 	global $topicpath_title;
 	global $ticket_jira_default_site;
+	global $show_passage;
 	if (!isset($ticket_link_sites) || !is_array($ticket_link_sites)) {
 		return '';
 	}
@@ -240,10 +241,12 @@ function get_html_scripting_data($page, $in_editing)
 EOS;
 		return $empty_data;
 	}
+	$is_show_passage = (bool)($show_passage !== 0);
 	// Site basic Properties
 	$props = array(
 		'is_utf8' => $is_utf8,
 		'json_enabled' => $json_enabled,
+		'show_passage' => $is_show_passage,
 		'base_uri_pathname' => get_base_uri(PKWK_URI_ROOT),
 		'base_uri_absolute' => get_base_uri(PKWK_URI_ABSOLUTE)
 	);

--- a/skin/search2.js
+++ b/skin/search2.js
@@ -658,6 +658,7 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
      * @param {boolean} insertTop
      */
     function addSearchResult(results, searchText, searchRegex, parentElement, insertTop) {
+      var props = getSiteProps();
       var now = new Date();
       var parentFragment = document.createDocumentFragment();
       results.forEach(function(val) {
@@ -670,8 +671,12 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
           decoratedName = escapeHTML(val.name);
         }
         var updatedAt = val.updatedAt;
-        var liHtml = '<a href="' + escapeHTML(href) + '">' + decoratedName + '</a> ' +
-          getPassage(now, updatedAt);
+        var passageHtml = '';
+        if (props.show_passage) {
+          passageHtml = ' ' + getPassage(now, updatedAt);
+        }
+        var liHtml = '<a href="' + escapeHTML(href) + '">' +
+          decoratedName + '</a>' + passageHtml;
         li.innerHTML = liHtml;
         li.setAttribute('data-pagename', val.name);
         fragment.appendChild(li);