Merge branch 'master' into gh-pages

Conflicts:
	index.html

CHANGES.rst

 Changelog
 =========
 
+0.5.1 (Unreleased)
+------------------
+
+- #13, #14: Messages sent between to GTalk accounts weren't being received. [jcbrand]
+- #32: Default status was offline when user didn't have contacts. [jcbrand]
+- Attach panels to the DOM upon initialize. [jcbrand]
+
 0.5.0 (2013-07-30)
 ------------------
 

Gruntfile.js

@@ -25,7 +25,7 @@ module.exports = function(grunt) {
                         "*/"
             },
             minify: {
-                dest: 'converse-'+cfg.version+'.min.css',
+                dest: 'converse.min.css',
                 src: ['converse.css']
             }
         },
@@ -34,7 +34,7 @@ module.exports = function(grunt) {
                 options: {
                     baseUrl: ".",
                     name: "main",
-                    out: "converse-"+cfg.version+".min.js",
+                    out: "converse.min.js",
                     paths: {
                         "require": "components/requirejs/require",
                         "jquery": "components/jquery/jquery",
@@ -106,8 +106,7 @@ module.exports = function(grunt) {
         });
     });
 
-    // TODO: update CHANGES.txt with release date
-    grunt.registerTask('release', 'Create a new release', ['requirejs', 'cssmin']);
+    grunt.registerTask('minify', 'Create a new release', ['requirejs', 'cssmin']);
 
     grunt.registerTask('check', 'Perform all checks (e.g. before releasing)', function () {
         grunt.task.run('jshint', 'test');

index.html

@@ -5,9 +5,9 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1" />
     <meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" />
     <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="converse-0.5.0.min.css">
-    <script src="converse-0.5.0.min.js"></script>
-    <!-- For development: <script data-main="main" src="Libraries/require-jquery.js"></script> -->
+    <link rel="stylesheet" type="text/css" media="screen" href="converse.min.css">
+    <script src="converse.min.js"></script>
+    <!-- For development <script data-main="main" src="components/requirejs/require.js"></script> -->
     <title>Converse.js</title>
 </head>
 

package.json

 {
   "name": "converse.js",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Browser based XMPP instant messaging client",
   "main": "main.js",
   "directories": {

spec/MainSpec.js

@@ -56,6 +56,12 @@
             it("can be opened by clicking a DOM element with class 'toggle-online-users'", open_controlbox);
 
             describe("The Status Widget", $.proxy(function () {
+                it("shows the user's chat status, which is online by default", $.proxy(function () {
+                    var view = this.xmppstatusview;
+                    expect(view.$el.find('a.choose-xmpp-status').hasClass('online')).toBe(true);
+                    expect(view.$el.find('a.choose-xmpp-status').attr('data-value')).toBe('I am online');
+                }, converse));
+
                 it("can be used to set the current user's chat status", $.proxy(function () {
                     var view = this.xmppstatusview;
                     spyOn(view, 'toggleOptions').andCallThrough();
@@ -64,25 +70,26 @@
                     runs(function () {
                         view.$el.find('a.choose-xmpp-status').click();
                         expect(view.toggleOptions).toHaveBeenCalled();
-                        expect(view.$el.find('a.choose-xmpp-status').hasClass('online')).toBe(false);
                     });
                     waits(250);
                     runs(function () {
                         spyOn(view, 'updateStatusUI').andCallThrough();
                         view.initialize(); // Rebind events for spy
-                        view.$el.find('.dropdown dd ul li a').first().click();
+                        $(view.$el.find('.dropdown dd ul li a')[1]).click();
                         expect(view.setStatus).toHaveBeenCalled();
                     });
                     waits(250);
                     runs($.proxy(function () {
                         expect(view.updateStatusUI).toHaveBeenCalled();
-                        expect(view.$el.find('a.choose-xmpp-status').hasClass('online')).toBe(true);
-                        expect(view.$el.find('a.choose-xmpp-status').attr('data-value')).toBe('I am online');
+                        expect(view.$el.find('a.choose-xmpp-status').hasClass('online')).toBe(false);
+                        expect(view.$el.find('a.choose-xmpp-status').hasClass('dnd')).toBe(true);
+                        expect(view.$el.find('a.choose-xmpp-status').attr('data-value')).toBe('I am busy');
                     }, converse));
                 }, converse));
 
                 it("can be used to set a custom status message", $.proxy(function () {
                     var view = this.xmppstatusview;
+                    this.xmppstatus.save({'status': 'online'});
                     spyOn(view, 'setStatusMessage').andCallThrough();
                     spyOn(view, 'renderStatusChangeForm').andCallThrough();
                     view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
@@ -120,6 +127,7 @@
                 it("can be added to the roster and they will be sorted alphabetically", $.proxy(function () {
                     var i, t, is_last;
                     spyOn(this.rosterview, 'render').andCallThrough();
+                    spyOn(this.xmppstatus, 'sendPresence');
                     for (i=0; i<pend_names.length; i++) {
                         is_last = i===(pend_names.length-1);
                         this.roster.create({
@@ -133,6 +141,7 @@
                         // the last contact has been added.
                         if (is_last) {
                             expect(this.rosterview.$el.is(':visible')).toEqual(true);
+                            expect(this.xmppstatus.sendPresence).toHaveBeenCalled();
                         } else {
                             expect(this.rosterview.$el.is(':visible')).toEqual(false);
                         }

tests_main.js

@@ -75,7 +75,6 @@ require([
         auto_subscribe: false,
         animate: false
     });
-    converse.onConnected(mock_connection);
 
     // Jasmine stuff
     var jasmineEnv = jasmine.getEnv();
@@ -93,5 +92,5 @@ require([
         };
         jasmineEnv.updateInterval = 200;
     }
-    jasmineEnv.execute();
+    converse.onConnected(mock_connection, $.proxy(jasmineEnv.execute, jasmineEnv));
 });