scratchfoundation/jquery-timeago
1
0
Fork 0
mirror of https://github.com/scratchfoundation/jquery-timeago.git synced 2024-12-12 08:51:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #75 from jgraichen/title

Browse source 
Preserve already present title attributes in time tags.
This commit is contained in:
Ryan McGeary 2012-05-10 08:40:25 -07:00
commit b78598f73f
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
jquery.timeago.js
View file

@ -96,10 +96,12 @@
return new Date(s); return new Date(s);
}, },
datetime: function(elem) { datetime: function(elem) {
// jQuery's `is()` doesn't play well with HTML5 in IE var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
var isTime = $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
return $t.parse(iso8601); 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")) { if (!element.data("timeago")) {
element.data("timeago", { datetime: $t.datetime(element) }); element.data("timeago", { datetime: $t.datetime(element) });
var text = $.trim(element.text()); var text = $.trim(element.text());
if (text.length > 0) { if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
element.attr("title", text); element.attr("title", text);
} }
} }

11
test/index.html
View file

@ -73,6 +73,9 @@
<p>Date only (default tooltip): <abbr id="defaultTooltip" class="timeago" title="2008-02-26"> </abbr>.</p> <p>Date only (default tooltip): <abbr id="defaultTooltip" class="timeago" title="2008-02-26"> </abbr>.</p>
<p>Timestsamp (with millis): <abbr class="timeago" title="1978-12-18T17:17:00.021Z">(you shouldn't see this)</abbr>.</p> <p>Timestsamp (with millis): <abbr class="timeago" title="1978-12-18T17:17:00.021Z">(you shouldn't see this)</abbr>.</p>
<p><time id="testTimeTitle" class="timeago" datetime="2012-05-07T10:06:02+02:00" title="May 10, 2012 10:06">May 10, 2012</time></p>
<p><time id="testTimeTitle2" class="timeago" datetime="2012-05-07T10:06:02+02:00">May 10, 2012</time></p>
<h2>Errors</h2> <h2>Errors</h2>
<p>Bad (letters): <abbr class="bad timeago" title="bleh">(this should be displayed)</abbr>.</p> <p>Bad (letters): <abbr class="bad timeago" title="bleh">(this should be displayed)</abbr>.</p>
@ -302,6 +305,14 @@
ok($("#defaultTooltip").attr("title") == "2008-02-26", "correctly set"); ok($("#defaultTooltip").attr("title") == "2008-02-26", "correctly set");
}); });
test("should preserve title in time tags", function () {
ok(($("#testTimeTitle").attr('title') === "May 10, 2012 10:06"), "title preserved")
});
test("should set title in time tags without a title", function () {
ok(($("#testTimeTitle2").attr('title') === "May 10, 2012"), "title set")
});
module("Parsing"); module("Parsing");
// Note, different browsers behave slightly different // Note, different browsers behave slightly different