From bbde3e9f507ca4e8dc1647075d70e58c2e630dcb Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 20 Aug 2014 19:18:00 -0300 Subject: [PATCH] Added timeago.js to chat --- app/views/shared/logged_in/xmpp_chat.html.erb | 4 ++-- public/javascripts/chat.js | 13 ++++++++----- public/javascripts/jquery.timeago.js | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ public/stylesheets/chat.css | 8 ++++++-- 4 files changed, 237 insertions(+), 9 deletions(-) create mode 100644 public/javascripts/jquery.timeago.js diff --git a/app/views/shared/logged_in/xmpp_chat.html.erb b/app/views/shared/logged_in/xmpp_chat.html.erb index 77086a4..24af565 100644 --- a/app/views/shared/logged_in/xmpp_chat.html.erb +++ b/app/views/shared/logged_in/xmpp_chat.html.erb @@ -1,4 +1,4 @@ - <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', :cache => 'cache/chat' %> + <%= javascript_include_tag 'strophejs-1.1.3/strophe.min', 'jquery.emoticon', '../designs/icons/pidgin/emoticons.js', 'ba-linkify', 'jquery.ba-hashchange', 'jquery.sound', 'chat', 'perfect-scrollbar.min.js', 'perfect-scrollbar.with-mousewheel.min.js', 'jquery.timeago.js', :cache => 'cache/chat' %> <%= stylesheet_link_tag 'perfect-scrollbar.min.css' %> <% extend ChatHelper %> @@ -71,7 +71,7 @@
%{name}
- %{time} +

%{message}

diff --git a/public/javascripts/chat.js b/public/javascripts/chat.js index 168f020..33afbcc 100644 --- a/public/javascripts/chat.js +++ b/public/javascripts/chat.js @@ -120,7 +120,7 @@ jQuery(function($) { return body; }, - show_message: function (jid, name, body, who, identifier) { + show_message: function (jid, name, body, who, identifier, time) { if (body) { body = Jabber.render_body_message(body); var jid_id = Jabber.jid_to_id(jid); @@ -129,8 +129,9 @@ jQuery(function($) { $(tab_id).find('.history').find('.message:last .content').append('

' + body + '

'); } else { - var time = new Date(); - time = time.getHours() + ':' + checkTime(time.getMinutes()); + if (time==undefined) { + time = new Date().toISOString(); + } var message_html = $('#chat #chat-templates .message').clone().html() .replace('%{message}', body) .replace(/%{who}/g, who) @@ -138,6 +139,7 @@ jQuery(function($) { .replace('%{name}', name) .replace('%{avatar}', getAvatar(identifier)); $('#' + Jabber.conversation_prefix + jid_id).find('.history').append(message_html); + $(".message span.time").timeago(); } $(tab_id).find('.history').scrollTo({top:'100%', left:'0%'}); if (who != "self") { @@ -593,11 +595,12 @@ jQuery(function($) { var body = message['body']; var from = message['from']; var to = message['to']; + var date = message['created_at']; if(from['id']!=getCurrentIdentifier()) { - Jabber.show_message(from['id']+'@127.0.0.1', from['name'], body, 'other', from['id']); + Jabber.show_message(from['id']+'@127.0.0.1', from['name'], body, 'other', from['id'], date); } else { - Jabber.show_message(to['id']+'@127.0.0.1', $own_name, body, 'self', to['id']); + Jabber.show_message(to['id']+'@127.0.0.1', $own_name, body, 'self', to['id'], date); } }); }); diff --git a/public/javascripts/jquery.timeago.js b/public/javascripts/jquery.timeago.js new file mode 100644 index 0000000..ef9327a --- /dev/null +++ b/public/javascripts/jquery.timeago.js @@ -0,0 +1,221 @@ +/** + * 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"). + * + * @name timeago + * @version 1.4.1 + * @requires jQuery v1.2.3+ + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2013, 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 { + // Browser globals + factory(jQuery); + } +}(function ($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowPast: true, + allowFuture: false, + localeTitle: false, + cutoff: 0, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + inPast: 'any moment 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", + wordSeparator: " ", + numbers: [] + } + }, + + inWords: function(distanceMillis) { + if(!this.settings.allowPast && ! this.settings.allowFuture) { + throw 'timeago allowPast and allowFuture settings can not both be set to false.'; + } + + 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; + } + } + + if(!this.settings.allowPast && distanceMillis >= 0) { + return this.settings.strings.inPast; + } + + var seconds = Math.abs(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 < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return $.trim([prefix, words, suffix].join(separator)); + }, + + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\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 + s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + // functions that can be called via $(el).timeago('action') + // init is default when no action is given + // functions are called with context of a single element + var functions = { + init: function(){ + var refresh_el = $.proxy(refresh, this); + refresh_el(); + var $s = $t.settings; + if ($s.refreshMillis > 0) { + 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()); + refresh.apply(this); + }, + updateFromDOM: function(){ + $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); + refresh.apply(this); + }, + dispose: function () { + if (this._timeagoInterval) { + window.clearInterval(this._timeagoInterval); + this._timeagoInterval = null; + } + } + }; + + $.fn.timeago = function(action, options) { + var fn = action ? functions[action] : functions.init; + if(!fn){ + throw new Error("Unknown function name '"+ action +"' for timeago"); + } + // each over objects here and call the requested function + this.each(function(){ + fn.call(this, options); + }); + return this; + }; + + function refresh() { + //check if it's still visible + if(!$.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) { + $(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 ($t.settings.localeTitle) { + element.attr("title", element.data('timeago').datetime.toLocaleString()); + } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + 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"); +})); diff --git a/public/stylesheets/chat.css b/public/stylesheets/chat.css index 5e80e39..e6b9f66 100644 --- a/public/stylesheets/chat.css +++ b/public/stylesheets/chat.css @@ -129,9 +129,12 @@ } #chat-window .history .message .time { float: right; - color: gray; + color: rgb(184, 184, 184); font-style: italic; - font-size: 11px; + font-size: 10px; + border-bottom: 1px solid rgba(255, 255, 255, 0.1); + width: 100%; + text-align: right; } #chat-window .history .message h5, #chat-window .history .message p { margin: 0; @@ -139,6 +142,7 @@ #chat-window .history .message p { max-width: 100%; overflow: auto; + clear: both; } #chat-window .history .message .content { -- libgit2 0.21.2