diff --git a/jquery.timeago.js b/jquery.timeago.js index ec80c323..c0e66e4f 100644 --- a/jquery.timeago.js +++ b/jquery.timeago.js @@ -94,7 +94,7 @@ var years = days / 365; function substitute(stringOrFunction, number) { - var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var string = typeof stringOrFunction === "function" ? stringOrFunction(number, distanceMillis) : stringOrFunction; var value = ($l.numbers && $l.numbers[number]) || number; return string.replace(/%d/i, value); } @@ -113,11 +113,11 @@ var separator = $l.wordSeparator || ""; if ($l.wordSeparator === undefined) { separator = " "; } - return $.trim([prefix, words, suffix].join(separator)); + return [prefix, words, suffix].join(separator).trim(); }, parse: function(iso8601) { - var s = $.trim(iso8601); + var s = iso8601.trim(); s = s.replace(/\.\d+/,""); // remove milliseconds s = s.replace(/-/,"/").replace(/-/,"/"); s = s.replace(/T/," ").replace(/Z/," UTC"); @@ -141,7 +141,7 @@ var functions = { init: function() { functions.dispose.call(this); - var refresh_el = $.proxy(refresh, this); + var refresh_el = refresh.bind(this); refresh_el(); var $s = $t.settings; if ($s.refreshMillis > 0) { @@ -208,7 +208,7 @@ element = $(element); if (!element.data("timeago")) { element.data("timeago", { datetime: $t.datetime(element) }); - var text = $.trim(element.text()); + var text = element.text().trim(); if ($t.settings.localeTitle) { element.attr("title", element.data('timeago').datetime.toLocaleString()); } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {