From ed6fd93ac5f097a272b0169fb14d0d6dff33308e Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Fri, 4 Oct 2013 09:37:32 +0200 Subject: [PATCH] Make URLs in task titles clickable (#2289) --- plugins/libcalendaring/libcalendaring.js | 2 +- plugins/tasklist/tasklist.js | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js index 93e605a3..73d1c1ec 100644 --- a/plugins/libcalendaring/libcalendaring.js +++ b/plugins/libcalendaring/libcalendaring.js @@ -281,7 +281,7 @@ function rcube_libcalendaring(settings) var mailto_pattern = new RegExp('([^\\s\\n\\(\\);]+@'+utf_domain+')', 'ig'); return html - .replace(link_pattern, '$1$2') + .replace(link_pattern, '$1$2') .replace(mailto_pattern, '$1') .replace(/(mailto:)([^"]+)"/g, '$1$2" onclick="rcmail.command(\'compose\', \'$2\');return false"') .replace(/\n/g, "
"); diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js index 313e50a1..645a9ada 100644 --- a/plugins/tasklist/tasklist.js +++ b/plugins/tasklist/tasklist.js @@ -297,7 +297,10 @@ function rcube_tasklist_ui(settings) } e.bubble = false; break; - + + case 'extlink': + return true; + default: if (e.target.nodeName != 'INPUT') task_show_dialog(id); @@ -642,7 +645,7 @@ function rcube_tasklist_ui(settings) '
' + '' + '' + - '' + Q(rec.title) + '' + + '' + text2html(Q(rec.title)) + '' + '' + tags_html + '' + '' + Q(rec.date || rcmail.gettext('nodate','tasklist')) + '' + 'V' @@ -908,7 +911,7 @@ function rcube_tasklist_ui(settings) // fill dialog data $('#task-parent-title').html(Q(rec.parent_title || '')+' »').css('display', rec.parent_title ? 'block' : 'none'); - $('#task-title').html(Q(rec.title || '')); + $('#task-title').html(text2html(Q(rec.title || ''))); $('#task-description').html(text2html(rec.description || '', 300, 6))[(rec.description ? 'show' : 'hide')](); $('#task-date')[(rec.date ? 'show' : 'hide')]().children('.task-text').html(Q(rec.date || rcmail.gettext('nodate','tasklist'))); $('#task-time').html(Q(rec.time || ''));