harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update jquery.timeago lib

Browse Source
This commit is contained in:
Mario Vavti 2018-07-13 10:12:11 +02:00
parent e000d98cc5
commit 5076e38c1c
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
library/jquery.timeago.js
View File

@ -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.6.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
@ -11,13 +11,15 @@
* For usage and examples, visit: * For usage and examples, visit:
* http://timeago.yarp.com/ * 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) { (function (factory) {
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,
@ -137,6 +140,7 @@
// 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() {
functions.dispose.call(this);
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,10 +148,12 @@
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() {
@ -175,19 +181,24 @@
}; };
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;

2
view/js/mod_mail.js
View File

@ -1,8 +1,8 @@
$(document).ready(function() { $(document).ready(function() {
$(".autotime").timeago();
$("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) { $("#recip").name_autocomplete(baseurl + '/acl', 'm', false, function(data) {
$("#recip-complete").val(data.xid); $("#recip-complete").val(data.xid);
}); });
$(".autotime").timeago()
$('#prvmail-text').bbco_autocomplete('bbcode'); $('#prvmail-text').bbco_autocomplete('bbcode');
$("#prvmail-text").editor_autocomplete(baseurl+"/acl"); $("#prvmail-text").editor_autocomplete(baseurl+"/acl");
}); });