Skip to content

Added some arguments to the string-generating functions #41

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 1 commit into
base: master
Choose a base branch
from
Open

Added some arguments to the string-generating functions #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions jquery.timeago.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
if (timestamp instanceof Date) {
return inWords(timestamp);
} else if (typeof timestamp === "string") {
return inWords($.timeago.parse(timestamp));
return inWords($.timeago.parse(timestamp), timestamp);
} else {
return inWords($.timeago.datetime(timestamp));
return inWords($.timeago.datetime(timestamp), timestamp);
}
};
var $t = $.timeago;
Expand Down Expand Up @@ -48,7 +48,7 @@
numbers: []
}
},
inWords: function(distanceMillis) {
inWords: function(distanceMillis, date, origDate) {
var $l = this.settings.strings;
var prefix = $l.prefixAgo;
var suffix = $l.suffixAgo;
Expand All @@ -67,7 +67,7 @@
var years = days / 365;

function substitute(stringOrFunction, number) {
var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis, date, origDate) : stringOrFunction;
var value = ($l.numbers && $l.numbers[number]) || number;
return string.replace(/%d/i, value);
}
Expand Down Expand Up @@ -116,15 +116,15 @@
function refresh() {
var data = prepareData(this);
if (!isNaN(data.datetime)) {
$(this).text(inWords(data.datetime));
$(this).text(inWords(data.datetime, data.origDate));
}
return this;
}

function prepareData(element) {
element = $(element);
if (!element.data("timeago")) {
element.data("timeago", { datetime: $t.datetime(element) });
element.data("timeago", { datetime: $t.datetime(element), origDate: element.attr("title") });
var text = $.trim(element.text());
if (text.length > 0) {
element.attr("title", text);
Expand All @@ -133,8 +133,8 @@
return element.data("timeago");
}

function inWords(date) {
return $t.inWords(distance(date));
function inWords(date, origDate) {
return $t.inWords(distance(date), date, origDate);
}

function distance(date) {
Expand Down