Commit: acb25a8e90673626f1d8bbe69f8fe6b69b932925 - pukiwiki-fork (git)

Commit MetaInfo

• Revision: acb25a8e90673626f1d8bbe69f8fe6b69b932925 (tree)
• Time: 2018-03-28 02:54:20
• Author: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2431 Topicpath title by JavaScript

pukiwiki.ini.php

$topicpath_title = 1; // (1: Enabled(default), 0: Disabled)

Change Summary

• modified: lib/html.php
• modified: plugin/topicpath.inc.php
• modified: pukiwiki.ini.php
• modified: skin/main.js
• modified: skin/pukiwiki.css

Incremental Difference

--- a/lib/html.php
+++ b/lib/html.php
@@ -186,7 +186,7 @@ function catbody($title, $page, $body)
 		}
 	}
 	// Embed Scripting data
-	$html_scripting_data = get_html_scripting_data();
+	$html_scripting_data = get_html_scripting_data($_page);
 
 	// Compat: 'HTML convert time' without time about MenuBar and skin
 	$taketime = elapsedtime();
@@ -217,10 +217,11 @@ function _decorate_Nth_word($matches)
 /**
  * Get data used by JavaScript modules
  */
-function get_html_scripting_data()
+function get_html_scripting_data($page)
 {
 	global $ticket_link_sites, $plugin;
 	global $external_link_cushion_page, $external_link_cushion;
+	global $topicpath_title;
 	if (!isset($ticket_link_sites) || !is_array($ticket_link_sites)) {
 		return '';
 	}
@@ -272,12 +273,23 @@ EOS;
 <input type="hidden" class="external-link-cushion" value="$h_cushion" />
 EOS;
 	}
+	// Topicpath title
+	$topicpath_data = '';
+	if ($topicpath_title && exist_plugin('topicpath')) {
+		$parents = plugin_topicpath_parent_links($page);
+		$h_topicpath = htmlsc(json_encode($parents,
+		JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+		$topicpath_data = <<<EOS
+<input type="hidden" class="topicpath-links" value="$h_topicpath" />
+EOS;
+	}
 	$data = <<<EOS
 <div id="pukiwiki-site-properties" style="display:none;">
 $site_props
 $plugin_prop
 $ticketlink_data
 $external_link_cushion_data
+$topicpath_data
 </div>
 EOS;
 	return $data;

--- a/plugin/topicpath.inc.php
+++ b/plugin/topicpath.inc.php
@@ -2,7 +2,7 @@
 // PukiWiki - Yet another WikiWikiWeb clone
 // topicpath.inc.php
 // Copyright
-//   2004-2017 PukiWiki Development Team
+//   2004-2018 PukiWiki Development Team
 //   2003      reimy       (Some bug fix)
 //   2003      t.m         (Migrate to 1.3)
 //   2003      Nibun-no-ni (Originally written for PukiWiki 1.4.x)
@@ -30,40 +30,49 @@ function plugin_topicpath_convert()
 	return '<div>' . plugin_topicpath_inline() . '</div>';
 }
 
+function plugin_topicpath_parent_links($page)
+{
+	$parts = explode('/', $page);
+	$parents = array();
+	for ($i = 0, $pos = 0; $pos = strpos($page, '/', $i); $i = $pos + 1) {
+		$p = substr($page, 0, $pos);
+		$parents[] = array(
+			'page' => $p,
+			'leaf' => substr($p, $i),
+			'uri' => get_page_uri($p),
+		);
+	}
+	return $parents;
+}
+
 function plugin_topicpath_inline()
 {
 	global $vars, $defaultpage;
-
 	$page = isset($vars['page']) ? $vars['page'] : '';
 	if ($page == '' || $page == $defaultpage) return '';
-
-	$parts = explode('/', $page);
-
-	$b_link = TRUE;
-	if (PLUGIN_TOPICPATH_THIS_PAGE_DISPLAY) {
-		$b_link = PLUGIN_TOPICPATH_THIS_PAGE_LINK;
-	} else {
-		array_pop($parts); // Remove the page itself
-	}
-
+	$parents = plugin_topicpath_parent_links($page);
 	$topic_path = array();
-	while (! empty($parts)) {
-		$_landing = join('/', $parts);
-		$element  = htmlsc(array_pop($parts));
-		if (! $b_link)  {
-			// This page ($_landing == $page)
-			$b_link = TRUE;
-			$topic_path[] = $element;
-		} else if (PKWK_READONLY && ! is_page($_landing)) {
+	foreach ($parents as $p) {
+		if (PKWK_READONLY && !is_page($p['page'])) {
 			// Page not exists
-			$topic_path[] = $element;
+			$topic_path[] = htmlsc($p['leaf']);
 		} else {
 			// Page exists or not exists
-			$topic_path[] = '<a href="' . get_page_uri($_landing) . '">' .
-				$element . '</a>';
+			$topic_path[] = '<a href="' . $p['uri'] . '">' .
+				$p['leaf'] . '</a>';
+		}
+	}
+	// This page
+	if (PLUGIN_TOPICPATH_THIS_PAGE_DISPLAY) {
+		$leaf_name = preg_replace('#^.*/#', '', $page);
+		if (PLUGIN_TOPICPATH_THIS_PAGE_LINK) {
+			$topic_path[] = '<a href="' . get_page_uri($page) . '">' .
+				$leaf_name . '</a>';
+		} else {
+			$topic_path[] = htmlsc($leaf_name);
 		}
 	}
-	$s = join(PLUGIN_TOPICPATH_TOP_SEPARATOR, array_reverse($topic_path));
+	$s = join(PLUGIN_TOPICPATH_TOP_SEPARATOR, $topic_path);
 	if (PLUGIN_TOPICPATH_TOP_DISPLAY) {
 		$s = '<span class="topicpath-top">' .
 			make_pagelink($defaultpage, PLUGIN_TOPICPATH_TOP_LABEL) .

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -334,6 +334,12 @@ $external_link_cushion = array(
 );
 
 /////////////////////////////////////////////////
+// Show Topicpath title
+// 0: Disabled
+// 1: Enabled
+$topicpath_title = 1;
+
+/////////////////////////////////////////////////
 // Output HTML meta Referrer Policy
 // Value: '' (default), no-referrer, origin, same-origin, ...
 // Reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy

--- a/skin/main.js
+++ b/skin/main.js
@@ -452,7 +452,7 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
           link.classList.add('internal-link');
         } else {
           if (domainMatch(host, silentExternalDomainsR) ||
-            link.innerText.replace(/\s+/g, '') === '') {
+            link.textContent.replace(/\s+/g, '') === '') {
             // Don't show extenal link icons on these domains
             link.classList.add('external-link-silent');
           }
@@ -466,9 +466,41 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
       }
     });
   }
+  function makeTopicpathTitle() {
+    var topicpathE = document.querySelector('#pukiwiki-site-properties .topicpath-links');
+    if (!topicpathE || !topicpathE.value) return;
+    var topicpathLinks = JSON.parse(topicpathE.value);
+    if (!topicpathLinks) return;
+    var titleH1 = document.querySelector('h1.title');
+    if (!titleH1) return;
+    var aList = titleH1.querySelectorAll('a');
+    if (!aList || aList.length > 1) return;
+    var a = titleH1.querySelector('a');
+    if (!a) return;
+    var fragment = document.createDocumentFragment();
+    for (var i = 0, n = topicpathLinks.length; i < n; i++) {
+      var path = topicpathLinks[i];
+      var a1 = document.createElement('a');
+      a1.setAttribute('href', path.uri);
+      a1.setAttribute('title', path.page);
+      a1.textContent = path.leaf;
+      fragment.appendChild(a1);
+      var span = document.createElement('span');
+      span.className = 'topicpath-slash';
+      span.textContent = '/';
+      fragment.appendChild(span);
+    }
+    var a2 = document.createElement('a');
+    a2.setAttribute('href', a.getAttribute('href'));
+    a2.setAttribute('title', 'Backlinks');
+    a2.textContent = a.textContent.replace(/^.+\//, '');
+    fragment.appendChild(a2);
+    titleH1.replaceChild(fragment, a);
+  }
   setYourName();
   autoTicketLink();
   confirmEditFormLeaving();
   showPagePassage();
   convertExternalLinkToCushionPageLink();
+  makeTopicpathTitle();
 });

--- a/skin/pukiwiki.css
+++ b/skin/pukiwiki.css
@@ -625,7 +625,7 @@ td.vote_td2 {
 
 /* topicpath.inc.php */
 span.topicpath-slash {
-  margin: 0 0.4em;
+  margin: 0 0.2em;
 }
 span.topicpath-top {
   user-select: none;