added timeago jquery plugin. we now need to figure out a js translation scheme
This commit is contained in:
parent
602ec3d707
commit
f97a9fa017
6 changed files with 151 additions and 2 deletions
|
|
@ -11,4 +11,4 @@
|
|||
|
||||
.info
|
||||
%span.time
|
||||
= hash[:comment].created_at ? t('ago', :time => time_ago_in_words(hash[:comment].created_at)) : time_ago_in_words(Time.now)
|
||||
= hash[:comment].created_at ? timeago(hash[:comment].created_at) : timeago(Time.now)
|
||||
|
|
|
|||
|
|
@ -39,5 +39,5 @@
|
|||
= link_to "#{note.person.name.titleize}", person_path(note.person)
|
||||
= object_link(note)
|
||||
|
||||
%span.time= "#{t('ago', :time => time_ago_in_words(note.created_at))}"
|
||||
%span.time= timeago(note.created_at)
|
||||
= will_paginate @notifications
|
||||
|
|
|
|||
|
|
@ -12,10 +12,12 @@ javascripts:
|
|||
- public/javascripts/vendor/jquery.autoresize.min.js
|
||||
- public/javascripts/vendor/facebox.js
|
||||
- public/javascripts/vendor/jquery.infinitescroll.min.js
|
||||
- public/javascripts/vendor/timeago.js
|
||||
- public/javascripts/vendor/fileuploader.js
|
||||
- public/javascripts/view.js
|
||||
- public/javascripts/stream.js
|
||||
- public/javascripts/application.js
|
||||
|
||||
mobile:
|
||||
- public/javascripts/vendor/jquery144.min.js
|
||||
- public/javascripts/custom-mobile-scripting.js
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ var Stream = {
|
|||
var $stream = $(".stream");
|
||||
var $publisher = $("#publisher");
|
||||
|
||||
$("abbr.timeago").timeago();
|
||||
$stream.not(".show").delegate("a.show_post_comments", "click", Stream.toggleComments);
|
||||
|
||||
/* In field labels */
|
||||
|
|
@ -139,6 +140,7 @@ var Stream = {
|
|||
$("#photodropzone").find('li').remove();
|
||||
$("#publisher textarea").removeClass("with_attachments");
|
||||
});
|
||||
|
||||
$(".new_status_message").bind('ajax:failure', function(data, html, xhr) {
|
||||
alert('failed to post message!');
|
||||
});
|
||||
|
|
|
|||
142
public/javascripts/vendor/timeago.js
vendored
Normal file
142
public/javascripts/vendor/timeago.js
vendored
Normal file
|
|
@ -0,0 +1,142 @@
|
|||
/*
|
||||
* timeago: a jQuery plugin, version: 0.9.2 (2010-09-14)
|
||||
* @requires jQuery v1.2.3 or later
|
||||
*
|
||||
* Timeago is a jQuery plugin that makes it easy to support automatically
|
||||
* updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
|
||||
*
|
||||
* For usage and examples, visit:
|
||||
* http://timeago.yarp.com/
|
||||
*
|
||||
* Licensed under the MIT:
|
||||
* http://www.opensource.org/licenses/mit-license.php
|
||||
*
|
||||
* Copyright (c) 2008-2010, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
|
||||
*/
|
||||
(function($) {
|
||||
$.timeago = function(timestamp) {
|
||||
if (timestamp instanceof Date) return inWords(timestamp);
|
||||
else if (typeof timestamp == "string") return inWords($.timeago.parse(timestamp));
|
||||
else return inWords($.timeago.datetime(timestamp));
|
||||
};
|
||||
var $t = $.timeago;
|
||||
|
||||
$.extend($.timeago, {
|
||||
settings: {
|
||||
refreshMillis: 60000,
|
||||
allowFuture: false,
|
||||
strings: {
|
||||
prefixAgo: null,
|
||||
prefixFromNow: null,
|
||||
suffixAgo: "ago",
|
||||
suffixFromNow: "from now",
|
||||
seconds: "less than a minute",
|
||||
minute: "about a minute",
|
||||
minutes: "%d minutes",
|
||||
hour: "about an hour",
|
||||
hours: "about %d hours",
|
||||
day: "a day",
|
||||
days: "%d days",
|
||||
month: "about a month",
|
||||
months: "%d months",
|
||||
year: "about a year",
|
||||
years: "%d years",
|
||||
numbers: []
|
||||
}
|
||||
},
|
||||
inWords: function(distanceMillis) {
|
||||
var $l = this.settings.strings;
|
||||
var prefix = $l.prefixAgo;
|
||||
var suffix = $l.suffixAgo;
|
||||
if (this.settings.allowFuture) {
|
||||
if (distanceMillis < 0) {
|
||||
prefix = $l.prefixFromNow;
|
||||
suffix = $l.suffixFromNow;
|
||||
}
|
||||
distanceMillis = Math.abs(distanceMillis);
|
||||
}
|
||||
|
||||
var seconds = distanceMillis / 1000;
|
||||
var minutes = seconds / 60;
|
||||
var hours = minutes / 60;
|
||||
var days = hours / 24;
|
||||
var years = days / 365;
|
||||
|
||||
function substitute(stringOrFunction, number) {
|
||||
var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
|
||||
var value = ($l.numbers && $l.numbers[number]) || number;
|
||||
return string.replace(/%d/i, value);
|
||||
}
|
||||
|
||||
var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
|
||||
seconds < 90 && substitute($l.minute, 1) ||
|
||||
minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
|
||||
minutes < 90 && substitute($l.hour, 1) ||
|
||||
hours < 24 && substitute($l.hours, Math.round(hours)) ||
|
||||
hours < 48 && substitute($l.day, 1) ||
|
||||
days < 30 && substitute($l.days, Math.floor(days)) ||
|
||||
days < 60 && substitute($l.month, 1) ||
|
||||
days < 365 && substitute($l.months, Math.floor(days / 30)) ||
|
||||
years < 2 && substitute($l.year, 1) ||
|
||||
substitute($l.years, Math.floor(years));
|
||||
|
||||
return $.trim([prefix, words, suffix].join(" "));
|
||||
},
|
||||
parse: function(iso8601) {
|
||||
var s = $.trim(iso8601);
|
||||
s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
|
||||
s = s.replace(/-/,"/").replace(/-/,"/");
|
||||
s = s.replace(/T/," ").replace(/Z/," UTC");
|
||||
s = s.replace(/([\+-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
|
||||
return new Date(s);
|
||||
},
|
||||
datetime: function(elem) {
|
||||
// jQuery's `is()` doesn't play well with HTML5 in IE
|
||||
var isTime = $(elem).get(0).tagName.toLowerCase() == "time"; // $(elem).is("time");
|
||||
var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
|
||||
return $t.parse(iso8601);
|
||||
}
|
||||
});
|
||||
|
||||
$.fn.timeago = function() {
|
||||
var self = this;
|
||||
self.each(refresh);
|
||||
|
||||
var $s = $t.settings;
|
||||
if ($s.refreshMillis > 0) {
|
||||
setInterval(function() { self.each(refresh); }, $s.refreshMillis);
|
||||
}
|
||||
return self;
|
||||
};
|
||||
|
||||
function refresh() {
|
||||
var data = prepareData(this);
|
||||
if (!isNaN(data.datetime)) {
|
||||
$(this).text(inWords(data.datetime));
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
function prepareData(element) {
|
||||
element = $(element);
|
||||
if (!element.data("timeago")) {
|
||||
element.data("timeago", { datetime: $t.datetime(element) });
|
||||
var text = $.trim(element.text());
|
||||
if (text.length > 0) element.attr("title", text);
|
||||
}
|
||||
return element.data("timeago");
|
||||
}
|
||||
|
||||
function inWords(date) {
|
||||
return $t.inWords(distance(date));
|
||||
}
|
||||
|
||||
function distance(date) {
|
||||
return (new Date().getTime() - date.getTime());
|
||||
}
|
||||
|
||||
// fix for IE6 suckage
|
||||
document.createElement("abbr");
|
||||
document.createElement("time");
|
||||
})(jQuery);
|
||||
|
||||
|
|
@ -108,6 +108,8 @@ var WebSocketReceiver = {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
$("abbr.timeago").timeago();
|
||||
},
|
||||
|
||||
processPost: function(className, postId, html, aspectIds) {
|
||||
|
|
@ -132,6 +134,7 @@ var WebSocketReceiver = {
|
|||
showMessage();
|
||||
}
|
||||
}
|
||||
$("abbr.timeago").timeago();
|
||||
},
|
||||
|
||||
onPageForClass: function(className) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue