Skip to content

Support options in jquery fn and direct call #155

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

Closed
wants to merge 3 commits into from
Closed

Support options in jquery fn and direct call #155

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac9f982
make custom settings works
eguitarz Dec 16, 2013
5610269
make directly call support options
eguitarz Dec 16, 2013
235e6fa
missed the argument
eguitarz Dec 16, 2013
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
Prev Previous commit
Next Next commit
make directly call support options
  • Loading branch information
@eguitarz
eguitarz committed Dec 16, 2013
commit 56102696c8cf61bd77fc05657c70bd3726378452
3 changes: 2 additions & 1 deletion jquery.timeago.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@
factory(jQuery);
}
}(function ($) {
$.timeago = function(timestamp) {
$.timeago = function(timestamp, options) {
$.extend( $.timeago.settings, options );
if (timestamp instanceof Date) {
return inWords(timestamp);
} else if (typeof timestamp === "string") {
Expand Down