From 92e87051445e8f51449ab26a4386cae0662a2676 Mon Sep 17 00:00:00 2001 From: Jan Graichen Date: Thu, 10 May 2012 11:00:18 +0200 Subject: [PATCH] Preserve already present title attribute in time tags. Also extract isTime check to avoid duplication. --- jquery.timeago.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jquery.timeago.js b/jquery.timeago.js index b4c93f4..b137ea6 100644 --- a/jquery.timeago.js +++ b/jquery.timeago.js @@ -96,10 +96,12 @@ return new Date(s); }, datetime: function(elem) { - // jQuery's `is()` doesn't play well with HTML5 in IE - var isTime = $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); - var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title"); + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); } }); @@ -127,7 +129,7 @@ if (!element.data("timeago")) { element.data("timeago", { datetime: $t.datetime(element) }); var text = $.trim(element.text()); - if (text.length > 0) { + if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { element.attr("title", text); } }