Added timeago.js to chat

Victor Costa · Rodrigo Souto
1 parent 8a138242
Showing 4 changed files with 237 additions and 9 deletions Show diff stats
app/views/shared/logged_in/xmpp_chat.html.erb
public/javascripts/chat.js
public/javascripts/jquery.timeago.js
public/stylesheets/chat.css
-    <%= 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 @@
             <h5 class="%{who}-name">%{name}</h5>
           </div>
           <div class="content">
-            <span class="time">%{time}</span>
+            <span class="time" title="%{time}"></span>
             <p>%{message}</p>
           </div>
         </div>
@@ -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('<p>' + body + '</p>');
             }
             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);
           }
         });
       });
@@ -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");
+}));
@@ -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 {
1		- <%= 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' %>
	1	+ <%= 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' %>
2	2	<%= stylesheet_link_tag 'perfect-scrollbar.min.css' %>
3	3
4	4	<% extend ChatHelper %>
...	...	@@ -71,7 +71,7 @@
71	71	<h5 class="%{who}-name">%{name}</h5>
72	72	</div>
73	73	<div class="content">
74		- <span class="time">%{time}</span>
	74	+ <span class="time" title="%{time}"></span>
75	75	<p>%{message}</p>
76	76	</div>
77	77	</div>
...	...
...	...	@@ -120,7 +120,7 @@ jQuery(function($) {
120	120	return body;
121	121	},
122	122
123		- show_message: function (jid, name, body, who, identifier) {
	123	+ show_message: function (jid, name, body, who, identifier, time) {
124	124	if (body) {
125	125	body = Jabber.render_body_message(body);
126	126	var jid_id = Jabber.jid_to_id(jid);
...	...	@@ -129,8 +129,9 @@ jQuery(function($) {
129	129	$(tab_id).find('.history').find('.message:last .content').append('<p>' + body + '</p>');
130	130	}
131	131	else {
132		- var time = new Date();
133		- time = time.getHours() + ':' + checkTime(time.getMinutes());
	132	+ if (time==undefined) {
	133	+ time = new Date().toISOString();
	134	+ }
134	135	var message_html = $('#chat #chat-templates .message').clone().html()
135	136	.replace('%{message}', body)
136	137	.replace(/%{who}/g, who)
...	...	@@ -138,6 +139,7 @@ jQuery(function($) {
138	139	.replace('%{name}', name)
139	140	.replace('%{avatar}', getAvatar(identifier));
140	141	$('#' + Jabber.conversation_prefix + jid_id).find('.history').append(message_html);
	142	+ $(".message span.time").timeago();
141	143	}
142	144	$(tab_id).find('.history').scrollTo({top:'100%', left:'0%'});
143	145	if (who != "self") {
...	...	@@ -593,11 +595,12 @@ jQuery(function($) {
593	595	var body = message['body'];
594	596	var from = message['from'];
595	597	var to = message['to'];
	598	+ var date = message['created_at'];
596	599
597	600	if(from['id']!=getCurrentIdentifier()) {
598		- Jabber.show_message(from['id']+'@127.0.0.1', from['name'], body, 'other', from['id']);
	601	+ Jabber.show_message(from['id']+'@127.0.0.1', from['name'], body, 'other', from['id'], date);
599	602	} else {
600		- Jabber.show_message(to['id']+'@127.0.0.1', $own_name, body, 'self', to['id']);
	603	+ Jabber.show_message(to['id']+'@127.0.0.1', $own_name, body, 'self', to['id'], date);
601	604	}
602	605	});
603	606	});
...	...
...	...	@@ -0,0 +1,221 @@
	1	+/**
	2	+ * Timeago is a jQuery plugin that makes it easy to support automatically
	3	+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
	4	+ *
	5	+ * @name timeago
	6	+ * @version 1.4.1
	7	+ * @requires jQuery v1.2.3+
	8	+ * @author Ryan McGeary
	9	+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
	10	+ *
	11	+ * For usage and examples, visit:
	12	+ * http://timeago.yarp.com/
	13	+ *
	14	+ * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [dot] org)
	15	+ */
	16	+
	17	+(function (factory) {
	18	+ if (typeof define === 'function' && define.amd) {
	19	+ // AMD. Register as an anonymous module.
	20	+ define(['jquery'], factory);
	21	+ } else {
	22	+ // Browser globals
	23	+ factory(jQuery);
	24	+ }
	25	+}(function ($) {
	26	+ $.timeago = function(timestamp) {
	27	+ if (timestamp instanceof Date) {
	28	+ return inWords(timestamp);
	29	+ } else if (typeof timestamp === "string") {
	30	+ return inWords($.timeago.parse(timestamp));
	31	+ } else if (typeof timestamp === "number") {
	32	+ return inWords(new Date(timestamp));
	33	+ } else {
	34	+ return inWords($.timeago.datetime(timestamp));
	35	+ }
	36	+ };
	37	+ var $t = $.timeago;
	38	+
	39	+ $.extend($.timeago, {
	40	+ settings: {
	41	+ refreshMillis: 60000,
	42	+ allowPast: true,
	43	+ allowFuture: false,
	44	+ localeTitle: false,
	45	+ cutoff: 0,
	46	+ strings: {
	47	+ prefixAgo: null,
	48	+ prefixFromNow: null,
	49	+ suffixAgo: "ago",
	50	+ suffixFromNow: "from now",
	51	+ inPast: 'any moment now',
	52	+ seconds: "less than a minute",
	53	+ minute: "about a minute",
	54	+ minutes: "%d minutes",
	55	+ hour: "about an hour",
	56	+ hours: "about %d hours",
	57	+ day: "a day",
	58	+ days: "%d days",
	59	+ month: "about a month",
	60	+ months: "%d months",
	61	+ year: "about a year",
	62	+ years: "%d years",
	63	+ wordSeparator: " ",
	64	+ numbers: []
	65	+ }
	66	+ },
	67	+
	68	+ inWords: function(distanceMillis) {
	69	+ if(!this.settings.allowPast && ! this.settings.allowFuture) {
	70	+ throw 'timeago allowPast and allowFuture settings can not both be set to false.';
	71	+ }
	72	+
	73	+ var $l = this.settings.strings;
	74	+ var prefix = $l.prefixAgo;
	75	+ var suffix = $l.suffixAgo;
	76	+ if (this.settings.allowFuture) {
	77	+ if (distanceMillis < 0) {
	78	+ prefix = $l.prefixFromNow;
	79	+ suffix = $l.suffixFromNow;
	80	+ }
	81	+ }
	82	+
	83	+ if(!this.settings.allowPast && distanceMillis >= 0) {
	84	+ return this.settings.strings.inPast;
	85	+ }
	86	+
	87	+ var seconds = Math.abs(distanceMillis) / 1000;
	88	+ var minutes = seconds / 60;
	89	+ var hours = minutes / 60;
	90	+ var days = hours / 24;
	91	+ var years = days / 365;
	92	+
	93	+ function substitute(stringOrFunction, number) {
	94	+ var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
	95	+ var value = ($l.numbers && $l.numbers[number]) \|\| number;
	96	+ return string.replace(/%d/i, value);
	97	+ }
	98	+
	99	+ var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) \|\|
	100	+ seconds < 90 && substitute($l.minute, 1) \|\|
	101	+ minutes < 45 && substitute($l.minutes, Math.round(minutes)) \|\|
	102	+ minutes < 90 && substitute($l.hour, 1) \|\|
	103	+ hours < 24 && substitute($l.hours, Math.round(hours)) \|\|
	104	+ hours < 42 && substitute($l.day, 1) \|\|
	105	+ days < 30 && substitute($l.days, Math.round(days)) \|\|
	106	+ days < 45 && substitute($l.month, 1) \|\|
	107	+ days < 365 && substitute($l.months, Math.round(days / 30)) \|\|
	108	+ years < 1.5 && substitute($l.year, 1) \|\|
	109	+ substitute($l.years, Math.round(years));
	110	+
	111	+ var separator = $l.wordSeparator \|\| "";
	112	+ if ($l.wordSeparator === undefined) { separator = " "; }
	113	+ return $.trim([prefix, words, suffix].join(separator));
	114	+ },
	115	+
	116	+ parse: function(iso8601) {
	117	+ var s = $.trim(iso8601);
	118	+ s = s.replace(/\.\d+/,""); // remove milliseconds
	119	+ s = s.replace(/-/,"/").replace(/-/,"/");
	120	+ s = s.replace(/T/," ").replace(/Z/," UTC");
	121	+ s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
	122	+ s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900
	123	+ return new Date(s);
	124	+ },
	125	+ datetime: function(elem) {
	126	+ var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
	127	+ return $t.parse(iso8601);
	128	+ },
	129	+ isTime: function(elem) {
	130	+ // jQuery's `is()` doesn't play well with HTML5 in IE
	131	+ return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
	132	+ }
	133	+ });
	134	+
	135	+ // functions that can be called via $(el).timeago('action')
	136	+ // init is default when no action is given
	137	+ // functions are called with context of a single element
	138	+ var functions = {
	139	+ init: function(){
	140	+ var refresh_el = $.proxy(refresh, this);
	141	+ refresh_el();
	142	+ var $s = $t.settings;
	143	+ if ($s.refreshMillis > 0) {
	144	+ this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis);
	145	+ }
	146	+ },
	147	+ update: function(time){
	148	+ var parsedTime = $t.parse(time);
	149	+ $(this).data('timeago', { datetime: parsedTime });
	150	+ if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString());
	151	+ refresh.apply(this);
	152	+ },
	153	+ updateFromDOM: function(){
	154	+ $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) });
	155	+ refresh.apply(this);
	156	+ },
	157	+ dispose: function () {
	158	+ if (this._timeagoInterval) {
	159	+ window.clearInterval(this._timeagoInterval);
	160	+ this._timeagoInterval = null;
	161	+ }
	162	+ }
	163	+ };
	164	+
	165	+ $.fn.timeago = function(action, options) {
	166	+ var fn = action ? functions[action] : functions.init;
	167	+ if(!fn){
	168	+ throw new Error("Unknown function name '"+ action +"' for timeago");
	169	+ }
	170	+ // each over objects here and call the requested function
	171	+ this.each(function(){
	172	+ fn.call(this, options);
	173	+ });
	174	+ return this;
	175	+ };
	176	+
	177	+ function refresh() {
	178	+ //check if it's still visible
	179	+ if(!$.contains(document.documentElement,this)){
	180	+ //stop if it has been removed
	181	+ $(this).timeago("dispose");
	182	+ return this;
	183	+ }
	184	+
	185	+ var data = prepareData(this);
	186	+ var $s = $t.settings;
	187	+
	188	+ if (!isNaN(data.datetime)) {
	189	+ if ( $s.cutoff == 0 \|\| Math.abs(distance(data.datetime)) < $s.cutoff) {
	190	+ $(this).text(inWords(data.datetime));
	191	+ }
	192	+ }
	193	+ return this;
	194	+ }
	195	+
	196	+ function prepareData(element) {
	197	+ element = $(element);
	198	+ if (!element.data("timeago")) {
	199	+ element.data("timeago", { datetime: $t.datetime(element) });
	200	+ var text = $.trim(element.text());
	201	+ if ($t.settings.localeTitle) {
	202	+ element.attr("title", element.data('timeago').datetime.toLocaleString());
	203	+ } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
	204	+ element.attr("title", text);
	205	+ }
	206	+ }
	207	+ return element.data("timeago");
	208	+ }
	209	+
	210	+ function inWords(date) {
	211	+ return $t.inWords(distance(date));
	212	+ }
	213	+
	214	+ function distance(date) {
	215	+ return (new Date().getTime() - date.getTime());
	216	+ }
	217	+
	218	+ // fix for IE6 suckage
	219	+ document.createElement("abbr");
	220	+ document.createElement("time");
	221	+}));
...	...
...	...	@@ -129,9 +129,12 @@
129	129	}
130	130	#chat-window .history .message .time {
131	131	float: right;
132		- color: gray;
	132	+ color: rgb(184, 184, 184);
133	133	font-style: italic;
134		- font-size: 11px;
	134	+ font-size: 10px;
	135	+ border-bottom: 1px solid rgba(255, 255, 255, 0.1);
	136	+ width: 100%;
	137	+ text-align: right;
135	138	}
136	139	#chat-window .history .message h5, #chat-window .history .message p {
137	140	margin: 0;
...	...	@@ -139,6 +142,7 @@
139	142	#chat-window .history .message p {
140	143	max-width: 100%;
141	144	overflow: auto;
	145	+ clear: both;
142	146	}
143	147
144	148	#chat-window .history .message .content {
...	...