Skip to content

Fix #363: Replace jQuery deprecated methods trim and isFunction #364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix #363: Replace jQuery deprecated methods trim and isFunction #364

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a030cb
Fix #363: Replace jQuery deprecated methods trim and isFunction
melloware Apr 25, 2020
5bc78c8
Inversed call to trim()
melloware Apr 25, 2020
016b8ba
Fix #363: Replace jQuery deprecated methods trim and isFunction and p…
melloware Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions jquery.timeago.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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");
Expand All @@ -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) {
Expand Down Expand Up @@ -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"))) {
Expand Down