Commit: a81938a8f6c6dd827008ed2cf3484765725c9de5 - pukiwiki-fork (git)

Commit MetaInfo

• Revision: a81938a8f6c6dd827008ed2cf3484765725c9de5 (tree)
• Time: 2017-04-02 17:00:29
• Author: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack/2420 AutoTicketLink: Support title for ticket link

Change Summary

• modified: pukiwiki.ini.php
• modified: skin/ticketlink.js

Incremental Difference

--- a/pukiwiki.ini.php
+++ b/pukiwiki.ini.php
@@ -293,11 +293,23 @@ $ticket_link_sites = array(
 /*
 	array(
 		'key' => 'phpbug',
-		'type' => 'redmine', // type: redmine or jira
-		'name' => 'PHP :: Bug #$1',
+		'type' => 'redmine', // type: redmine, jira or git
+		'title' => 'PHP :: Bug #$1',
 		'base_url' => 'https://bugs.php.net/bug.php?id=',
 	),
-	*/
+	array(
+		'key' => 'asfjira',
+		'type' => 'jira',
+		'title' => 'ASF JIRA [$1]',
+		'base_url' => 'https://issues.apache.org/jira/browse/',
+	),
+	array(
+		'key' => 'pukiwiki-commit',
+		'type' => 'git',
+		'title' => 'PukiWiki revision $1',
+		'base_url' => 'https://ja.osdn.net/projects/pukiwiki/scm/git/pukiwiki/commits/',
+	),
+*/
 );
 
 /////////////////////////////////////////////////

--- a/skin/ticketlink.js
+++ b/skin/ticketlink.js
@@ -7,16 +7,24 @@ if (window.addEventListener) {
     var headReText = '([\\s\\b]|^)';
     var tailReText = '\\b';
     var _siteList = getSiteListFromBody();
-    function ticketToUrl(keyText) {
+    function ticketToLink(keyText) {
       var siteList = getSiteList();
       for (var i = 0; i < siteList.length; i++) {
         var site = siteList[i];
         var m = keyText.match(site.re);
         if (m) {
-          return site.base_url + m[3];
+          var title = site.title;
+          var ticketKey = m[3]
+          if (title) {
+            title = title.replace(/\$1/g, ticketKey);
+          }
+          return {
+            url: site.base_url + m[3],
+            title: title
+          };
         }
       }
-      return '';
+      return null;
     }
     function regexEscape(key) {
       return key.replace(/[\-\.]/g, function (m) {
@@ -65,7 +73,7 @@ if (window.addEventListener) {
     function textToSiteInfo(siteDef) {
       if (!siteDef) return null;
       var info = JSON.parse(siteDef);
-      if (info && info.key && info.type && info.name && info.base_url) {
+      if (info && info.key && info.type && info.base_url) {
         return info;
       }
       return null;
@@ -101,7 +109,9 @@ if (window.addEventListener) {
         }
         var a = document.createElement('a');
         a.textContent = m[2];
-        a.href = ticketToUrl(a.textContent);
+        var linkInfo = ticketToLink(a.textContent);
+        a.href = linkInfo.url;
+        a.title = linkInfo.title;
         f.appendChild(a);
         text = text.substr(m.index + m[0].length);
       }