Merge branch 'chat_states'

Conflicts:
	docs/CHANGES.rst

css/converse.css

@@ -724,8 +724,7 @@
         text-overflow: ellipsis;
         margin-left: 3px; }
       #conversejs #converse-roster dd span {
-        padding: 0 5px 0 0;
-        margin-left: 3px; }
+        padding: 0 5px 0 0; }
       #conversejs #converse-roster dd a.decline-xmpp-request {
         margin-left: 5px; }
       #conversejs #converse-roster dd a.remove-xmpp-contact {
@@ -745,8 +744,11 @@
       color: #436F64; }
     #conversejs #converse-roster dd a.open-chat {
       width: 80%; }
-    #conversejs #converse-roster span.pending-contact-name, #conversejs #converse-roster span.req-contact-name {
+    #conversejs #converse-roster span.pending-contact-name {
       width: 80%; }
+    #conversejs #converse-roster span.req-contact-name {
+      width: 73%;
+      padding: 0; }
   #conversejs dd.available-chatroom {
     display: inline-block;
     overflow-x: hidden;
@@ -1235,5 +1237,3 @@
     margin-left: 0;
     cursor: n-resize;
     z-index: 20; }
-
-/*# sourceMappingURL=converse.css.map */

docs/CHANGES.rst

@@ -8,6 +8,7 @@ Changelog
 * Updated Afrikaans translations. [jcbrand]
 * Add responsiveness to CSS. We now use Sass preprocessor for generating CSS. [jcbrand]
 * #252, 253 Add fullname and jid to contact's tooltip in roster. [gbonvehi]
+* #292 Better support for XEP-0085 Chat State Notifications. [jcbrand]
 * #295 Document "allow_registration". [gbonvehi]
 
 0.8.6 (2014-12-07)

sass/converse.scss

@@ -773,7 +773,6 @@
       }
       span {
         padding: 0 5px 0 0;
-        margin-left: 3px;
       }
       a {
          &.decline-xmpp-request {
@@ -806,10 +805,13 @@
       }
     }
     span {
-      &.pending-contact-name,
-      &.req-contact-name {
+      &.pending-contact-name {
         width: 80%;
       }
+      &.req-contact-name {
+        width: 69%;
+        padding: 0;
+      }
     }
   }
 

tests/utils.js

@@ -12,14 +12,14 @@
     utils.createRequest = function (iq) {
         iq = typeof iq.tree == "function" ? iq.tree() : iq;
         var req = new Strophe.Request(iq, function() {});
-        req.getResponse = function() { 
+        req.getResponse = function() {
             var env = new Strophe.Builder('env', {type: 'mock'}).tree();
             env.appendChild(iq);
             return env;
         };
         return req;
     };
-    
+
     utils.closeAllChatBoxes = function () {
         var i, chatbox;
         for (i=converse.chatboxes.models.length-1; i>-1; i--) {