Merge branch 'master' of github.com:jcbrand/converse.js

Conflicts:
	converse.js

converse.css

@@ -25,6 +25,15 @@
     height: 1.1em;
 }
 
+#toggle-online-users {
+    display: none;
+}
+
+#connecting-to-chat {
+    background: url('/spinner.gif') no-repeat;
+    padding-left: 1.4em;
+}
+
 .chat-head {
     color: #ffffff;
     margin: 0;

converse.js

@@ -1291,7 +1291,6 @@
                 ask = item.get('ask'),
                 that = this,
                 subscription = item.get('subscription');
-
             this.$el.addClass(item.get('presence_type'));
             
             if (ask === 'subscribe') {
@@ -1803,6 +1802,7 @@
     // --------------
     $(document).ready($.proxy(function () {
         var chatdata = $('div#collective-xmpp-chat-data'),
+            $connecting = $('span#connecting-to-chat'),
             $toggle = $('a#toggle-online-users');
         $toggle.unbind('click');
 
@@ -1815,6 +1815,8 @@
         }).render();
 
         $(document).bind('jarnxmpp.disconnected', $.proxy(function (ev, conn) {
+            $connecting.show();
+            $toggle.hide();
             console.log("Connection Failed :(");
         }, this));
 
@@ -1861,6 +1863,8 @@
 
             // Controlbox toggler
             if ($toggle.length) {
+                $connecting.hide();
+                $toggle.show();
                 $toggle.bind('click', $.proxy(function (e) {
                     e.preventDefault();
                     if ($("div#controlbox").is(':visible')) {