update timeago to latest (#5139)

v1.18.x
Anil Mandepudi 8 years ago committed by Julian Lam
parent 8159c44df2
commit 0f8efe6cb8

@ -3,7 +3,7 @@
* updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
* *
* @name timeago * @name timeago
* @version 1.4.1 * @version 1.5.3
* @requires jQuery v1.2.3+ * @requires jQuery v1.2.3+
* @author Ryan McGeary * @author Ryan McGeary
* @license MIT License - http://www.opensource.org/licenses/mit-license.php * @license MIT License - http://www.opensource.org/licenses/mit-license.php
@ -18,6 +18,8 @@
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module. // AMD. Register as an anonymous module.
define(['jquery'], factory); define(['jquery'], factory);
} else if (typeof module === 'object' && typeof module.exports === 'object') {
factory(require('jquery'));
} else { } else {
// Browser globals // Browser globals
factory(jQuery); factory(jQuery);
@ -43,6 +45,7 @@
allowFuture: false, allowFuture: false,
localeTitle: false, localeTitle: false,
cutoff: 0, cutoff: 0,
autoDispose: true,
strings: { strings: {
prefixAgo: null, prefixAgo: null,
prefixFromNow: null, prefixFromNow: null,
@ -66,7 +69,7 @@
}, },
inWords: function(distanceMillis) { inWords: function(distanceMillis) {
if(!this.settings.allowPast && ! this.settings.allowFuture) { if (!this.settings.allowPast && ! this.settings.allowFuture) {
throw 'timeago allowPast and allowFuture settings can not both be set to false.'; throw 'timeago allowPast and allowFuture settings can not both be set to false.';
} }
@ -80,7 +83,7 @@
} }
} }
if(!this.settings.allowPast && distanceMillis >= 0) { if (!this.settings.allowPast && distanceMillis >= 0) {
return this.settings.strings.inPast; return this.settings.strings.inPast;
} }
@ -136,7 +139,7 @@
// init is default when no action is given // init is default when no action is given
// functions are called with context of a single element // functions are called with context of a single element
var functions = { var functions = {
init: function(){ init: function() {
var refresh_el = $.proxy(refresh, this); var refresh_el = $.proxy(refresh, this);
refresh_el(); refresh_el();
var $s = $t.settings; var $s = $t.settings;
@ -144,13 +147,13 @@
this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
} }
}, },
update: function(time){ update: function(timestamp) {
var parsedTime = $t.parse(time); var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
$(this).data('timeago', { datetime: parsedTime }); $(this).data('timeago', { datetime: date });
if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString()); if ($t.settings.localeTitle) $(this).attr("title", date.toLocaleString());
refresh.apply(this); refresh.apply(this);
}, },
updateFromDOM: function(){ updateFromDOM: function() {
$(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
refresh.apply(this); refresh.apply(this);
}, },
@ -164,30 +167,35 @@
$.fn.timeago = function(action, options) { $.fn.timeago = function(action, options) {
var fn = action ? functions[action] : functions.init; var fn = action ? functions[action] : functions.init;
if(!fn){ if (!fn) {
throw new Error("Unknown function name '"+ action +"' for timeago"); throw new Error("Unknown function name '"+ action +"' for timeago");
} }
// each over objects here and call the requested function // each over objects here and call the requested function
this.each(function(){ this.each(function() {
fn.call(this, options); fn.call(this, options);
}); });
return this; return this;
}; };
function refresh() { function refresh() {
var $s = $t.settings;
//check if it's still visible //check if it's still visible
if(!$.contains(document.documentElement,this)){ if ($s.autoDispose && !$.contains(document.documentElement,this)) {
//stop if it has been removed //stop if it has been removed
$(this).timeago("dispose"); $(this).timeago("dispose");
return this; return this;
} }
var data = prepareData(this); var data = prepareData(this);
var $s = $t.settings;
if (!isNaN(data.datetime)) { if (!isNaN(data.datetime)) {
if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) {
$(this).text(inWords(data.datetime)); $(this).text(inWords(data.datetime));
} else {
if ($(this).attr('title').length > 0) {
$(this).text($(this).attr('title'));
}
} }
} }
return this; return this;

Loading…
Cancel
Save