aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-07-13 10:12:11 +0200
committerMario Vavti <mario@mariovavti.com>2018-07-13 10:12:11 +0200
commit5076e38c1cd883be5db0a3f84fe75a8af7a6d197 (patch)
tree9b9a7c03caef2ee1f621d965add0497882049bd7
parente000d98cc544bf2f340b8183337e86667be82893 (diff)
downloadvolse-hubzilla-5076e38c1cd883be5db0a3f84fe75a8af7a6d197.tar.gz
volse-hubzilla-5076e38c1cd883be5db0a3f84fe75a8af7a6d197.tar.bz2
volse-hubzilla-5076e38c1cd883be5db0a3f84fe75a8af7a6d197.zip
update jquery.timeago lib
-rw-r--r--library/jquery.timeago.js41
-rw-r--r--view/js/mod_mail.js4
2 files changed, 28 insertions, 17 deletions
diff --git a/library/jquery.timeago.js b/library/jquery.timeago.js
index ef9327aac..f7b640149 100644
--- a/library/jquery.timeago.js
+++ b/library/jquery.timeago.js
@@ -3,7 +3,7 @@
* updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
*
* @name timeago
- * @version 1.4.1
+ * @version 1.6.3
* @requires jQuery v1.2.3+
* @author Ryan McGeary
* @license MIT License - http://www.opensource.org/licenses/mit-license.php
@@ -11,13 +11,15 @@
* For usage and examples, visit:
* http://timeago.yarp.com/
*
- * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ * Copyright (c) 2008-2017, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
*/
(function (factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['jquery'], factory);
+ } else if (typeof module === 'object' && typeof module.exports === 'object') {
+ factory(require('jquery'));
} else {
// Browser globals
factory(jQuery);
@@ -43,6 +45,7 @@
allowFuture: false,
localeTitle: false,
cutoff: 0,
+ autoDispose: true,
strings: {
prefixAgo: null,
prefixFromNow: null,
@@ -66,7 +69,7 @@
},
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.';
}
@@ -80,7 +83,7 @@
}
}
- if(!this.settings.allowPast && distanceMillis >= 0) {
+ if (!this.settings.allowPast && distanceMillis >= 0) {
return this.settings.strings.inPast;
}
@@ -136,7 +139,8 @@
// init is default when no action is given
// functions are called with context of a single element
var functions = {
- init: function(){
+ init: function() {
+ functions.dispose.call(this);
var refresh_el = $.proxy(refresh, this);
refresh_el();
var $s = $t.settings;
@@ -144,13 +148,15 @@
this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
}
},
- update: function(time){
- var parsedTime = $t.parse(time);
- $(this).data('timeago', { datetime: parsedTime });
- if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString());
+ update: function(timestamp) {
+ var date = (timestamp instanceof Date) ? timestamp : $t.parse(timestamp);
+ $(this).data('timeago', { datetime: date });
+ if ($t.settings.localeTitle) {
+ $(this).attr("title", date.toLocaleString());
+ }
refresh.apply(this);
},
- updateFromDOM: function(){
+ updateFromDOM: function() {
$(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
refresh.apply(this);
},
@@ -164,30 +170,35 @@
$.fn.timeago = function(action, options) {
var fn = action ? functions[action] : functions.init;
- if(!fn){
+ if (!fn) {
throw new Error("Unknown function name '"+ action +"' for timeago");
}
// each over objects here and call the requested function
- this.each(function(){
+ this.each(function() {
fn.call(this, options);
});
return this;
};
function refresh() {
+ var $s = $t.settings;
+
//check if it's still visible
- if(!$.contains(document.documentElement,this)){
+ if ($s.autoDispose && !$.contains(document.documentElement,this)) {
//stop if it has been removed
$(this).timeago("dispose");
return this;
}
var data = prepareData(this);
- var $s = $t.settings;
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));
+ } else {
+ if ($(this).attr('title').length > 0) {
+ $(this).text($(this).attr('title'));
+ }
}
}
return this;
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 15a45519b..e3c891c2c 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -1,8 +1,8 @@
$(document).ready(function() {
+ $(".autotime").timeago();
$("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) {
$("#recip-complete").val(data.xid);
});
- $(".autotime").timeago()
$('#prvmail-text').bbco_autocomplete('bbcode');
- $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
+ $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
});