Merge branch 'master' into gh-pages

Conflicts:
	build.js
	converse.min.css
	converse.min.js
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html

.bowerrc

+{
+    "directory": "components"
+}

.travis.yml

+language: node_js
+node_js:
+ - "0.10.13"
+script: grunt test

CHANGES.rst

 Changelog
 =========
 
-0.5 (Unreleased)
-----------------
+0.5.0 (2013-07-30)
+------------------
 
 - #09 Remove dependency on AMD/require.js [jcbrand]
 - #22 Fixed compare operator in strophe.muc [sonata82]
@@ -11,9 +11,10 @@ Changelog
 - #25 Using span with css instead of img [matheus-morfi]
 - #26 Only the first minute digit shown in chatbox. [jcbrand]
 - #28 Add Brazilian Portuguese translations [matheus-morfi]
+- Use Bower to manage 3rd party dependencies. [jcbrand]
 
-0.4 (2013-06-03)
-----------------
+0.4.0 (2013-06-03)
+------------------
 
 - CSS tweaks: fixed overflowing text in status message and chatrooms list. [jcbrand]
 - Bugfix: Couldn't join chatroom when clicking from a list of rooms. [jcbrand]
@@ -24,8 +25,8 @@ Changelog
 - Reconnect automatically when the connection drops. [jcbrand]
 - Add support for internationalization. [jcbrand]
 
-0.3 (2013-05-21)
-----------------
+0.3.0 (2013-05-21)
+------------------
 
 - Add vCard support [jcbrand]
 - Remember custom status messages upon reload. [jcbrand]
@@ -40,15 +41,15 @@ Changelog
 - Multi-user chatrooms are now configurable. [jcbrand]
 
 
-0.2 (2013-03-28)
-----------------
+0.2.0 (2013-03-28)
+------------------
 
 - Performance enhancements and general script cleanup [ichim-david]
 - Add "Connecting to chat..." info [alecghica]
 - Various smaller improvements and bugfixes [jcbrand]
 
 
-0.1 (2012-06-12)
-----------------
+0.1.0 (2012-06-12)
+------------------
 
 - Created [jcbrand]

CONTRIBUTING.rst

@@ -2,7 +2,7 @@
 Contributing to Converse.js
 ===========================
 
-Thanks for contributing to Converse.js_! 
+Thanks for contributing to Converse.js_.
 
 Please follow the usual github workflow. Create your own local fork of this repository,
 make your changes and then submit a pull request.
@@ -19,12 +19,27 @@ for testing.
 Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how
 the tests are implemented.
 
-Check that the tests run
-------------------------
+If you are unsure how to write tests, please `contact me`_ and I'll be happy to
+help.
 
-Check that the Jasmine BDD tests complete sucessfully. Open tests.html in your
+Check that the tests pass
+-------------------------
+
+Check that the Jasmine tests complete sucessfully. Open tests.html in your
 browser, and the tests will run automatically.
 
 You can see the current test output online, here: http://conversejs.org/tests.html
 
+On the command line you can run ``grunt test`` (if you have before run ``npm
+install``).
+
+Check your code for errors or bad habits by running JSHint
+----------------------------------------------------------
+
+If you haven't yet done so, run ``npm install`` to install all development
+dependencies.
+
+Then run ``grunt jshint`` and check the output.
+
 .. _Converse.js: http://conversejs.org
+.. _`contact me`: http://opkode.com/contact.html

Gruntfile.js

 module.exports = function(grunt) {
+    var cfg = require('./package.json');
     grunt.initConfig({
         jshint: {
-        options: {
-            trailing: true
+            options: {
+                trailing: true
+            },
+            target: {
+                src : [
+                    'converse.js',
+                    'mock.js',
+                    'main.js',
+                    'tests_main.js',
+                    'spec/*.js'
+                ]
+            }
         },
-        target: {
-            src : [
-                'converse.js',
-                'mock.js',
-                'main.js',
-                'tests_main.js',
-                'spec/*.js'
-            ]
-        }
+        cssmin: {
+            options: {
+                banner: "/*"+
+                        "* Converse.js (Web-based XMPP instant messaging client) \n"+
+                        "* http://conversejs.org \n"+
+                        "* Copyright (c) 2012, Jan-Carel Brand <jc@opkode.com> \n"+
+                        "* Dual licensed under the MIT and GPL Licenses \n"+
+                        "*/"
+            },
+            minify: {
+                dest: 'converse-'+cfg.version+'.min.css',
+                src: ['converse.css']
+            }
+        },
+        requirejs: {
+            compile: {
+                options: {
+                    baseUrl: ".",
+                    name: "main",
+                    out: "converse-"+cfg.version+".min.js",
+                    paths: {
+                        "require": "components/requirejs/require",
+                        "jquery": "components/jquery/jquery",
+                        "jed": "components/jed/jed",
+                        "locales": "locale/locales",
+                        "af": "locale/af/LC_MESSAGES/af",
+                        "en": "locale/en/LC_MESSAGES/en",
+                        "de": "locale/de/LC_MESSAGES/de",
+                        "es": "locale/es/LC_MESSAGES/es",
+                        "it": "locale/it/LC_MESSAGES/it",
+                        "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR", 
+                        "sjcl": "components/sjcl/sjcl",
+                        "tinysort": "components/tinysort/src/jquery.tinysort",
+                        "underscore": "components/underscore/underscore",
+                        "backbone": "components/backbone/backbone",
+                        "localstorage": "components/backbone.localStorage/backbone.localStorage",
+                        "strophe": "components/strophe/strophe",
+                        "strophe.muc": "components/strophe.muc/index",
+                        "strophe.roster": "components/strophe.roster/index",
+                        "strophe.vcard": "components/strophe.vcard/index",
+                        "strophe.disco": "components/strophe.disco/index"
+                    },
+                    done: function(done, output) {
+                        var duplicates = require('rjs-build-analysis').duplicates(output);
+                        if (duplicates.length > 0) {
+                            grunt.log.subhead('Duplicates found in requirejs build:');
+                            grunt.log.warn(duplicates);
+                            done(new Error('r.js built duplicate modules, please check the excludes option.'));
+                        }
+                        done();
+                    }
+                }
+            }
         }
     });
+    grunt.loadNpmTasks('grunt-contrib-cssmin');
     grunt.loadNpmTasks('grunt-contrib-jshint');
-    grunt.registerTask('default', ['jshint']);
+    grunt.loadNpmTasks('grunt-contrib-requirejs');
+
+    grunt.registerTask('test', 'Run Tests', function () {
+        var done = this.async();
+        var child_process = require('child_process');
+        var exec = child_process.exec;
+        exec('./node_modules/.bin/phantomjs '+
+             'node_modules/jasmine-reporters/test/phantomjs-testrunner.js '+
+             __dirname+'/tests.html',
+             function (err, stdout, stderr) {
+                if (err) {
+                    grunt.log.write('Tests failed with error code '+err.code);
+                    grunt.log.write(stderr);
+                }
+                grunt.log.write(stdout);
+                done();
+        });
+    });
+
+    grunt.registerTask('fetch', 'Set up the development environment', function () {
+        var done = this.async();
+        var child_process = require('child_process');
+        var exec = child_process.exec;
+        exec('bower update && cd ./components/strophe && make normal',
+             function (err, stdout, stderr) {
+                if (err) {
+                    grunt.log.write('build failed with error code '+err.code);
+                    grunt.log.write(stderr);
+                }
+                grunt.log.write(stdout);
+                done();
+        });
+    });
+
+    // TODO: update CHANGES.txt with release date
+    grunt.registerTask('release', 'Create a new release', ['requirejs', 'cssmin']);
+
+    grunt.registerTask('check', 'Perform all checks (e.g. before releasing)', function () {
+        grunt.task.run('jshint', 'test');
+    });
 };

Libraries/backbone.localStorage.js

-/**
- * Backbone localStorage Adapter
- * Version 1.1.0
- *
- * https://github.com/jeromegn/Backbone.localStorage
- */
-(function (root, factory) {
-   if (typeof define === "function" && define.amd) {
-      // AMD. Register as an anonymous module.
-      define(["underscore","backbone"], function(_, Backbone) {
-        // Use global variables if the locals is undefined.
-        return factory(_ || root._, Backbone || root.Backbone);
-      });
-   } else {
-      // RequireJS isn't being used. Assume underscore and backbone is loaded in <script> tags
-      factory(_, Backbone);
-   }
-}(this, function(_, Backbone) {
-// A simple module to replace `Backbone.sync` with *localStorage*-based
-// persistence. Models are given GUIDS, and saved into a JSON object. Simple
-// as that.
-
-// Hold reference to Underscore.js and Backbone.js in the closure in order
-// to make things work even if they are removed from the global namespace
-
-// Generate four random hex digits.
-function S4() {
-   return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
-};
-
-// Generate a pseudo-GUID by concatenating random hexadecimal.
-function guid() {
-   return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4());
-};
-
-// Our Store is represented by a single JS object in *localStorage*. Create it
-// with a meaningful name, like the name you'd give a table.
-// window.Store is deprectated, use Backbone.LocalStorage instead
-Backbone.LocalStorage = window.Store = function(name) {
-  this.name = name;
-  var store = this.localStorage().getItem(this.name);
-  this.records = (store && store.split(",")) || [];
-};
-
-_.extend(Backbone.LocalStorage.prototype, {
-
-  // Save the current state of the **Store** to *localStorage*.
-  save: function() {
-    this.localStorage().setItem(this.name, this.records.join(","));
-  },
-
-  // Add a model, giving it a (hopefully)-unique GUID, if it doesn't already
-  // have an id of it's own.
-  create: function(model) {
-    if (!model.id) {
-      model.id = guid();
-      model.set(model.idAttribute, model.id);
-    }
-    this.localStorage().setItem(this.name+"-"+model.id, JSON.stringify(model));
-    this.records.push(model.id.toString());
-    this.save();
-    return this.find(model);
-  },
-
-  // Update a model by replacing its copy in `this.data`.
-  update: function(model) {
-    this.localStorage().setItem(this.name+"-"+model.id, JSON.stringify(model));
-    if (!_.include(this.records, model.id.toString()))
-      this.records.push(model.id.toString()); this.save();
-    return this.find(model);
-  },
-
-  // Retrieve a model from `this.data` by id.
-  find: function(model) {
-    return this.jsonData(this.localStorage().getItem(this.name+"-"+model.id));
-  },
-
-  // Return the array of all models currently in storage.
-  findAll: function() {
-    return _(this.records).chain()
-      .map(function(id){
-        return this.jsonData(this.localStorage().getItem(this.name+"-"+id));
-      }, this)
-      .compact()
-      .value();
-  },
-
-  // Delete a model from `this.data`, returning it.
-  destroy: function(model) {
-    if (model.isNew())
-      return false
-    this.localStorage().removeItem(this.name+"-"+model.id);
-    this.records = _.reject(this.records, function(id){
-      return id === model.id.toString();
-    });
-    this.save();
-    return model;
-  },
-
-  localStorage: function() {
-    return localStorage;
-  },
-  
-  // fix for "illegal access" error on Android when JSON.parse is passed null
-  jsonData: function (data) {
-      return data && JSON.parse(data);
-  }
-
-});
-
-// localSync delegate to the model or collection's
-// *localStorage* property, which should be an instance of `Store`.
-// window.Store.sync and Backbone.localSync is deprectated, use Backbone.LocalStorage.sync instead
-Backbone.LocalStorage.sync = window.Store.sync = Backbone.localSync = function(method, model, options) {
-  var store = model.localStorage || model.collection.localStorage;
-
-  var resp, errorMessage, syncDfd = $.Deferred && $.Deferred(); //If $ is having Deferred - use it. 
-
-  try {
-
-    switch (method) {
-      case "read":
-        resp = model.id != undefined ? store.find(model) : store.findAll();
-        break;
-      case "create":
-        resp = store.create(model);
-        break;
-      case "update":
-        resp = store.update(model);
-        break;
-      case "delete":
-        resp = store.destroy(model);
-        break;
-    }
-
-  } catch(error) {
-    if (error.code === DOMException.QUOTA_EXCEEDED_ERR && window.localStorage.length === 0)
-      errorMessage = "Private browsing is unsupported";
-    else
-      errorMessage = error.message;
-  }
-
-  if (resp) {
-    if (options && options.success)
-      if (Backbone.VERSION === "0.9.10") {
-        options.success(model, resp, options);
-      } else {
-        options.success(resp);
-      }
-    if (syncDfd)
-      syncDfd.resolve(resp);
-
-  } else {
-    errorMessage = errorMessage ? errorMessage
-                                : "Record Not Found";
-    
-    if (options && options.error)
-      if (Backbone.VERSION === "0.9.10") {
-        options.error(model, errorMessage, options);
-      } else {
-        options.error(errorMessage);
-      }
-      
-    if (syncDfd)
-      syncDfd.reject(errorMessage);
-  }
-  
-  // add compatibility with $.ajax
-  // always execute callback for success and error
-  if (options && options.complete) options.complete(resp);
-
-  return syncDfd && syncDfd.promise();
-};
-
-Backbone.ajaxSync = Backbone.sync;
-
-Backbone.getSyncMethod = function(model) {
-  if(model.localStorage || (model.collection && model.collection.localStorage)) {
-    return Backbone.localSync;
-  }
-
-  return Backbone.ajaxSync;
-};
-
-// Override 'Backbone.sync' to default to localSync,
-// the original 'Backbone.sync' is still available in 'Backbone.ajaxSync'
-Backbone.sync = function(method, model, options) {
-  return Backbone.getSyncMethod(model).apply(this, [method, model, options]);
-};
-
-return Backbone.LocalStorage;
-}));

Libraries/jasmine-1.3.1/MIT.LICENSE

-Copyright (c) 2008-2011 Pivotal Labs
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Libraries/jasmine-1.3.1/jasmine.css

-body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; }
-
-#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; }
-#HTMLReporter a { text-decoration: none; }
-#HTMLReporter a:hover { text-decoration: underline; }
-#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; }
-#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; }
-#HTMLReporter #jasmine_content { position: fixed; right: 100%; }
-#HTMLReporter .version { color: #aaaaaa; }
-#HTMLReporter .banner { margin-top: 14px; }
-#HTMLReporter .duration { color: #aaaaaa; float: right; }
-#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; }
-#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; }
-#HTMLReporter .symbolSummary li.passed { font-size: 14px; }
-#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; }
-#HTMLReporter .symbolSummary li.failed { line-height: 9px; }
-#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; }
-#HTMLReporter .symbolSummary li.skipped { font-size: 14px; }
-#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; }
-#HTMLReporter .symbolSummary li.pending { line-height: 11px; }
-#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; }
-#HTMLReporter .exceptions { color: #fff; float: right; margin-top: 5px; margin-right: 5px; }
-#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; }
-#HTMLReporter .runningAlert { background-color: #666666; }
-#HTMLReporter .skippedAlert { background-color: #aaaaaa; }
-#HTMLReporter .skippedAlert:first-child { background-color: #333333; }
-#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; }
-#HTMLReporter .passingAlert { background-color: #a6b779; }
-#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; }
-#HTMLReporter .failingAlert { background-color: #cf867e; }
-#HTMLReporter .failingAlert:first-child { background-color: #b03911; }
-#HTMLReporter .results { margin-top: 14px; }
-#HTMLReporter #details { display: none; }
-#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; }
-#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; }
-#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; }
-#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; }
-#HTMLReporter.showDetails .summary { display: none; }
-#HTMLReporter.showDetails #details { display: block; }
-#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; }
-#HTMLReporter .summary { margin-top: 14px; }
-#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; }
-#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; }
-#HTMLReporter .summary .specSummary.failed a { color: #b03911; }
-#HTMLReporter .description + .suite { margin-top: 0; }
-#HTMLReporter .suite { margin-top: 14px; }
-#HTMLReporter .suite a { color: #333333; }
-#HTMLReporter #details .specDetail { margin-bottom: 28px; }
-#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; }
-#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; }
-#HTMLReporter .resultMessage span.result { display: block; }
-#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; }
-
-#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ }
-#TrivialReporter a:visited, #TrivialReporter a { color: #303; }
-#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; }
-#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; }
-#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; }
-#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; }
-#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; }
-#TrivialReporter .runner.running { background-color: yellow; }
-#TrivialReporter .options { text-align: right; font-size: .8em; }
-#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; }
-#TrivialReporter .suite .suite { margin: 5px; }
-#TrivialReporter .suite.passed { background-color: #dfd; }
-#TrivialReporter .suite.failed { background-color: #fdd; }
-#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; }
-#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; }
-#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; }
-#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; }
-#TrivialReporter .spec.skipped { background-color: #bbb; }
-#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; }
-#TrivialReporter .passed { background-color: #cfc; display: none; }
-#TrivialReporter .failed { background-color: #fbb; }
-#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; }
-#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; }
-#TrivialReporter .resultMessage .mismatch { color: black; }
-#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; }
-#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; }
-#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; }
-#TrivialReporter #jasmine_content { position: fixed; right: 100%; }
-#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; }

Libraries/jquery.tinysort.js

-/*! TinySort 1.4.29
-* Copyright (c) 2008-2012 Ron Valstar http://www.sjeiti.com/
-*
-* Dual licensed under the MIT and GPL licenses:
-*   http://www.opensource.org/licenses/mit-license.php
-*   http://www.gnu.org/licenses/gpl.html
-*//*
-* Description:
-*   A jQuery plugin to sort child nodes by (sub) contents or attributes.
-*
-* Contributors:
-*	brian.gibson@gmail.com
-*	michael.thornberry@gmail.com
-*
-* Usage:
-*   $("ul#people>li").tsort();
-*   $("ul#people>li").tsort("span.surname");
-*   $("ul#people>li").tsort("span.surname",{order:"desc"});
-*   $("ul#people>li").tsort({place:"end"});
-*
-* Change default like so:
-*   $.tinysort.defaults.order = "desc";
-*
-* in this update:
-* 	- added plugin hook
-*   - stripped non-latin character ordering and turned it into a plugin
-*
-* in last update:
-*   - header comment no longer stripped in minified version
-*	- revision number no longer corresponds to svn revision since it's now git
-*
-* Todos:
-* 	- todo: uppercase vs lowercase
-* 	- todo: 'foobar' != 'foobars' in non-latin
-*
-*/
-;(function($) {
-	// private vars
-	var fls = !1							// minify placeholder
-		,nll = null							// minify placeholder
-		,prsflt = parseFloat				// minify placeholder
-		,mathmn = Math.min					// minify placeholder
-		,rxLastNr = /(-?\d+\.?\d*)$/g		// regex for testing strings ending on numbers
-		,aPluginPrepare = []
-		,aPluginSort = []
-	;
-	//
-	// init plugin
-	$.tinysort = {
-		 id: 'TinySort'
-		,version: '1.4.29'
-		,copyright: 'Copyright (c) 2008-2012 Ron Valstar'
-		,uri: 'http://tinysort.sjeiti.com/'
-		,licensed: {
-			MIT: 'http://www.opensource.org/licenses/mit-license.php'
-			,GPL: 'http://www.gnu.org/licenses/gpl.html'
-		}
-		,plugin: function(prepare,sort){
-			aPluginPrepare.push(prepare);	// function(settings){doStuff();}
-			aPluginSort.push(sort);			// function(valuesAreNumeric,sA,sB,iReturn){doStuff();return iReturn;}
-		}
-		,defaults: { // default settings
-
-			 order: 'asc'			// order: asc, desc or rand
-
-			,attr: nll				// order by attribute value
-			,data: nll				// use the data attribute for sorting
-			,useVal: fls			// use element value instead of text
-
-			,place: 'start'			// place ordered elements at position: start, end, org (original position), first
-			,returns: fls			// return all elements or only the sorted ones (true/false)
-
-			,cases: fls				// a case sensitive sort orders [aB,aa,ab,bb]
-			,forceStrings:fls		// if false the string '2' will sort with the value 2, not the string '2'
-
-			,sortFunction: nll		// override the default sort function
-		}
-	};
-	$.fn.extend({
-		tinysort: function(_find,_settings) {
-			if (_find&&typeof(_find)!='string') {
-				_settings = _find;
-				_find = nll;
-			}
-
-			var oSettings = $.extend({}, $.tinysort.defaults, _settings)
-				,sParent
-				,oThis = this
-				,iLen = $(this).length
-				,oElements = {} // contains sortable- and non-sortable list per parent
-				,bFind = !(!_find||_find=='')
-				,bAttr = !(oSettings.attr===nll||oSettings.attr=="")
-				,bData = oSettings.data!==nll
-				// since jQuery's filter within each works on array index and not actual index we have to create the filter in advance
-				,bFilter = bFind&&_find[0]==':'
-				,$Filter = bFilter?oThis.filter(_find):oThis
-				,fnSort = oSettings.sortFunction
-				,iAsc = oSettings.order=='asc'?1:-1
-				,aNewOrder = []
-			;
-
-			$.each(aPluginPrepare,function(i,fn){
-				fn.call(fn,oSettings);
-			});
-
-
-			if (!fnSort) fnSort = oSettings.order=='rand'?function() {
-				return Math.random()<.5?1:-1;
-			}:function(a,b) {
-				var bNumeric = fls
-				// maybe toLower
-					,sA = !oSettings.cases?toLowerCase(a.s):a.s
-					,sB = !oSettings.cases?toLowerCase(b.s):b.s;
-				// maybe force Strings
-//				var bAString = typeof(sA)=='string';
-//				var bBString = typeof(sB)=='string';
-//				if (!oSettings.forceStrings&&(bAString||bBString)) {
-//					if (!bAString) sA = ''+sA;
-//					if (!bBString) sB = ''+sB;
-				if (!oSettings.forceStrings) {
-					// maybe mixed
-					var  aAnum = sA&&sA.match(rxLastNr)
-						,aBnum = sB&&sB.match(rxLastNr);
-					if (aAnum&&aBnum) {
-						var  sAprv = sA.substr(0,sA.length-aAnum[0].length)
-							,sBprv = sB.substr(0,sB.length-aBnum[0].length);
-						if (sAprv==sBprv) {
-							bNumeric = !fls;
-							sA = prsflt(aAnum[0]);
-							sB = prsflt(aBnum[0]);
-						}
-					}
-				}
-				// return sort-integer
-				var iReturn = iAsc*(sA<sB?-1:(sA>sB?1:0));
-
-				$.each(aPluginSort,function(i,fn){
-					iReturn = fn.call(fn,bNumeric,sA,sB,iReturn);
-				});
-
-				return iReturn;
-			};
-
-			oThis.each(function(i,el) {
-				var $Elm = $(el)
-					// element or sub selection
-					,mElmOrSub = bFind?(bFilter?$Filter.filter(el):$Elm.find(_find)):$Elm
-					// text or attribute value
-					,sSort = bData?''+mElmOrSub.data(oSettings.data):(bAttr?mElmOrSub.attr(oSettings.attr):(oSettings.useVal?mElmOrSub.val():mElmOrSub.text()))
- 					// to sort or not to sort
-					,mParent = $Elm.parent();
-				if (!oElements[mParent])	oElements[mParent] = {s:[],n:[]};	// s: sort, n: not sort
-				if (mElmOrSub.length>0)		oElements[mParent].s.push({s:sSort,e:$Elm,n:i}); // s:string, e:element, n:number
-				else						oElements[mParent].n.push({e:$Elm,n:i});
-			});
-			//
-			// sort
-			for (sParent in oElements) oElements[sParent].s.sort(fnSort);
-			//
-			// order elements and fill new order
-			for (sParent in oElements) {
-				var oParent = oElements[sParent]
-					,aOrg = [] // list for original position
-					,iLow = iLen
-					,aCnt = [0,0] // count how much we've sorted for retreival from either the sort list or the non-sort list (oParent.s/oParent.n)
-					,i;
-				switch (oSettings.place) {
-					case 'first':	$.each(oParent.s,function(i,obj) { iLow = mathmn(iLow,obj.n) }); break;
-					case 'org':		$.each(oParent.s,function(i,obj) { aOrg.push(obj.n) }); break;
-					case 'end':		iLow = oParent.n.length; break;
-					default:		iLow = 0;
-				}
-				for (i = 0;i<iLen;i++) {
-					var bSList = contains(aOrg,i)?!fls:i>=iLow&&i<iLow+oParent.s.length
-						,mEl = (bSList?oParent.s:oParent.n)[aCnt[bSList?0:1]].e;
-					mEl.parent().append(mEl);
-					if (bSList||!oSettings.returns) aNewOrder.push(mEl.get(0));
-					aCnt[bSList?0:1]++;
-				}
-			}
-			oThis.length = 0;
-			Array.prototype.push.apply(oThis,aNewOrder);
-			return oThis;
-		}
-	});
-	// toLowerCase
-	function toLowerCase(s) {
-		return s&&s.toLowerCase?s.toLowerCase():s;
-	}
-	// array contains
-	function contains(a,n) {
-		for (var i=0,l=a.length;i<l;i++) if (a[i]==n) return !fls;
-		return fls;
-	}
-	// set functions
-	$.fn.TinySort = $.fn.Tinysort = $.fn.tsort = $.fn.tinysort;
-})(jQuery);
-
-/*! Array.prototype.indexOf for IE (issue #26) */
-if (!Array.prototype.indexOf) {
-	Array.prototype.indexOf = function(elt /*, from*/) {
-		var len = this.length
-			,from = Number(arguments[1])||0;
-		from = from<0?Math.ceil(from):Math.floor(from);
-		if (from<0) from += len;
-		for (;from<len;from++){
-			if (from in this && this[from]===elt) return from;
-		}
-		return -1;
-	};
-}

Libraries/strophe.disco.js

-/*
-  Copyright 2010, François de Metz <francois@2metz.fr>
-*/
-
-/**
- * Disco Strophe Plugin
- * Implement http://xmpp.org/extensions/xep-0030.html
- * TODO: manage node hierarchies, and node on info request
- */
-Strophe.addConnectionPlugin('disco',
-{
-    _connection: null,
-    _identities : [],
-    _features : [],
-    _items : [],
-    /** Function: init
-     * Plugin init
-     *
-     * Parameters:
-     *   (Strophe.Connection) conn - Strophe connection
-     */
-    init: function(conn)
-    {
-    this._connection = conn;
-        this._identities = [];
-        this._features   = [];
-        this._items      = [];
-        // disco info
-        conn.addHandler(this._onDiscoInfo.bind(this), Strophe.NS.DISCO_INFO, 'iq', 'get', null, null);
-        // disco items
-        conn.addHandler(this._onDiscoItems.bind(this), Strophe.NS.DISCO_ITEMS, 'iq', 'get', null, null);
-    },
-    /** Function: addIdentity
-     * See http://xmpp.org/registrar/disco-categories.html
-     * Parameters:
-     *   (String) category - category of identity (like client, automation, etc ...)
-     *   (String) type - type of identity (like pc, web, bot , etc ...)
-     *   (String) name - name of identity in natural language
-     *   (String) lang - lang of name parameter
-     *
-     * Returns:
-     *   Boolean
-     */
-    addIdentity: function(category, type, name, lang)
-    {
-        for (var i=0; i<this._identities.length; i++)
-        {
-            if (this._identities[i].category == category &&
-                this._identities[i].type == type &&
-                this._identities[i].name == name &&
-                this._identities[i].lang == lang)
-            {
-                return false;
-            }
-        }
-        this._identities.push({category: category, type: type, name: name, lang: lang});
-        return true;
-    },
-    /** Function: addFeature
-     *
-     * Parameters:
-     *   (String) var_name - feature name (like jabber:iq:version)
-     *
-     * Returns:
-     *   boolean
-     */
-    addFeature: function(var_name)
-    {
-        for (var i=0; i<this._features.length; i++)
-        {
-             if (this._features[i] == var_name)
-                 return false;
-        }
-        this._features.push(var_name);
-        return true;
-    },
-    /** Function: removeFeature
-     *
-     * Parameters:
-     *   (String) var_name - feature name (like jabber:iq:version)
-     *
-     * Returns:
-     *   boolean
-     */
-    removeFeature: function(var_name)
-    {
-        for (var i=0; i<this._features.length; i++)
-        {
-             if (this._features[i] === var_name){
-                 this._features.splice(i,1)
-                 return true;
-             }
-        }
-        return false;
-    },
-    /** Function: addItem
-     *
-     * Parameters:
-     *   (String) jid
-     *   (String) name
-     *   (String) node
-     *   (Function) call_back
-     *
-     * Returns:
-     *   boolean
-     */
-    addItem: function(jid, name, node, call_back)
-    {
-        if (node && !call_back)
-            return false;
-        this._items.push({jid: jid, name: name, node: node, call_back: call_back});
-        return true;
-    },
-    /** Function: info
-     * Info query
-     *
-     * Parameters:
-     *   (Function) call_back
-     *   (String) jid
-     *   (String) node
-     */
-    info: function(jid, node, success, error, timeout)
-    {
-        var attrs = {xmlns: Strophe.NS.DISCO_INFO};
-        if (node)
-            attrs.node = node;
-
-        var info = $iq({from:this._connection.jid,
-                         to:jid, type:'get'}).c('query', attrs);
-        this._connection.sendIQ(info, success, error, timeout);
-    },
-    /** Function: items
-     * Items query
-     *
-     * Parameters:
-     *   (Function) call_back
-     *   (String) jid
-     *   (String) node
-     */
-    items: function(jid, node, success, error, timeout)
-    {
-        var attrs = {xmlns: Strophe.NS.DISCO_ITEMS};
-        if (node)
-            attrs.node = node;
-
-        var items = $iq({from:this._connection.jid,
-                         to:jid, type:'get'}).c('query', attrs);
-        this._connection.sendIQ(items, success, error, timeout);
-    },
-
-    /** PrivateFunction: _buildIQResult
-     */
-    _buildIQResult: function(stanza, query_attrs)
-    {
-        var id   =  stanza.getAttribute('id');
-        var from = stanza.getAttribute('from');
-        var iqresult = $iq({type: 'result', id: id});
-
-        if (from !== null) {
-            iqresult.attrs({to: from});
-        }
-
-        return iqresult.c('query', query_attrs);
-    },
-
-    /** PrivateFunction: _onDiscoInfo
-     * Called when receive info request
-     */
-    _onDiscoInfo: function(stanza)
-    {
-        var node = stanza.getElementsByTagName('query')[0].getAttribute('node');
-        var attrs = {xmlns: Strophe.NS.DISCO_INFO};
-        if (node)
-        {
-            attrs.node = node;
-        }
-        var iqresult = this._buildIQResult(stanza, attrs);
-        for (var i=0; i<this._identities.length; i++)
-        {
-            var attrs = {category: this._identities[i].category,
-                         type    : this._identities[i].type};
-            if (this._identities[i].name)
-                attrs.name = this._identities[i].name;
-            if (this._identities[i].lang)
-                attrs['xml:lang'] = this._identities[i].lang;
-            iqresult.c('identity', attrs).up();
-        }
-        for (var i=0; i<this._features.length; i++)
-        {
-            iqresult.c('feature', {'var':this._features[i]}).up();
-        }
-        this._connection.send(iqresult.tree());
-        return true;
-    },
-    /** PrivateFunction: _onDiscoItems
-     * Called when receive items request
-     */
-    _onDiscoItems: function(stanza)
-    {
-        var query_attrs = {xmlns: Strophe.NS.DISCO_ITEMS};
-        var node = stanza.getElementsByTagName('query')[0].getAttribute('node');
-        if (node)
-        {
-            query_attrs.node = node;
-            var items = [];
-            for (var i = 0; i < this._items.length; i++)
-            {
-                if (this._items[i].node == node)
-                {
-                    items = this._items[i].call_back(stanza);
-                    break;
-                }
-            }
-        }
-        else
-        {
-            var items = this._items;
-        }
-        var iqresult = this._buildIQResult(stanza, query_attrs);
-        for (var i = 0; i < items.length; i++)
-        {
-            var attrs = {jid:  items[i].jid};
-            if (items[i].name)
-                attrs.name = items[i].name;
-            if (items[i].node)
-                attrs.node = items[i].node;
-            iqresult.c('item', attrs).up();
-        }
-        this._connection.send(iqresult.tree());
-        return true;
-    }
-});

Libraries/strophe.vcard.js

-// Generated by CoffeeScript 1.3.3
-/*
-Plugin to implement the vCard extension.
-http://xmpp.org/extensions/xep-0054.html
-
-Author: Nathan Zorn (nathan.zorn@gmail.com)
-CoffeeScript port: Andreas Guth (guth@dbis.rwth-aachen.de)
-*/
-
-/* jslint configuration:
-*/
-
-/* global document, window, setTimeout, clearTimeout, console,
-    XMLHttpRequest, ActiveXObject,
-    Base64, MD5,
-    Strophe, $build, $msg, $iq, $pres
-*/
-
-var buildIq;
-
-buildIq = function(type, jid, vCardEl) {
-  var iq;
-  iq = $iq(jid ? {
-    type: type,
-    to: jid
-  } : {
-    type: type
-  });
-  iq.c("vCard", {
-    xmlns: Strophe.NS.VCARD
-  });
-  if (vCardEl) {
-    iq.cnode(vCardEl);
-  }
-  return iq;
-};
-
-Strophe.addConnectionPlugin('vcard', {
-  _connection: null,
-  init: function(conn) {
-    this._connection = conn;
-    return Strophe.addNamespace('VCARD', 'vcard-temp');
-  },
-  /*Function
-    Retrieve a vCard for a JID/Entity
-    Parameters:
-    (Function) handler_cb - The callback function used to handle the request.
-    (String) jid - optional - The name of the entity to request the vCard
-       If no jid is given, this function retrieves the current user's vcard.
-  */
-
-  get: function(handler_cb, jid, error_cb) {
-    var iq;
-    iq = buildIq("get", jid);
-    return this._connection.sendIQ(iq, handler_cb, error_cb);
-  },
-  /* Function
-      Set an entity's vCard.
-  */
-
-  set: function(handler_cb, vCardEl, jid, error_cb) {
-    var iq;
-    iq = buildIq("set", jid, vCardEl);
-    return this._connection.sendIQ(iq, handler_cb, error_rb);
-  }
-});

README.rst

@@ -4,10 +4,11 @@ converse.js
 
 Converse.js_ is a web based `XMPP/Jabber`_ instant messaging client.
 
-It is used by collective.xmpp.chat_, which is a Plone_ instant messaging add-on.
+It enables you to add chat functionality to your website, independent of any
+specific backend. You will however need an XMPP server to connect to, either
+your own, or a public one.
 
-The ultimate goal is to enable anyone to add chat functionality to their websites, independent of any backend.
-You will however need an XMPP server to connect to, either your own, or a public one.
+It is used by collective.xmpp.chat_, which is a Plone_ instant messaging add-on.
 
 --------
 Features
@@ -15,15 +16,19 @@ Features
 
 It has the following features:
 
-* Manually or automically subscribe to other users.
+* Single-user chat
+* Multi-user chat in chatrooms
+* vCard support
+* Service discovery
+* Contact rosters
+* Manually or automically subscribe to other contacts
 * Accept or decline contact requests
-* Chat status (online, busy, away, offline)
+* Roster item exchange
+* Chat statuses (online, busy, away, offline)
 * Custom status messages
 * Typing notifications
 * Third person messages (/me )
-* Multi-user chat in chatrooms
-* Chatroom Topics
-* vCard support
+* Translated into multiple languages  (af, de, es, it, pt_BR)
 
 -----------
 Screencasts
@@ -32,15 +37,39 @@ Screencasts
 * `In a static HTML page`_. Here we chat to external XMPP accounts on Jabber.org and Gmail.
 * `Integrated into a Plone site`_ via collective.xmpp.chat.
 
+----
+Demo
+----
+
+A live demo is available at `conversejs.org`_
+
+-----
+Tests
+-----
+
+We use behavior-driven tests written with jasmine.js_. They can run in your
+browser (`see here`_) or in the command line via phantom.js_.
+
+We use `Travis-CI`_ for continuous integration.
+
+.. image:: https://api.travis-ci.org/jcbrand/converse.js.png?branch=master
+
+-------------
+Documentation
+-------------
+
+The developer/integrator documentation can be found at `<http://conversejs.org/docs/html>`_.
+
+
 ------------
 Dependencies
 ------------
 
 It depends on quite a few third party libraries, including:
 
+* jquery_
 * strophe.js_
 * backbone.js_ 
-* require.js_
 
 -------
 Licence
@@ -61,3 +90,9 @@ Licence
 .. _Screencast2: http://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript
 .. _`Integrated into a Plone site`: http://opkode.com/media/blog/instant-messaging-for-plone-with-javascript-and-xmpp
 .. _`In a static HTML page`: http://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript
+.. _`conversejs.org`: http://conversejs.org
+.. _jquery: http://jquery.com
+.. _jasmine.js: http://pivotal.github.io/jasmine
+.. _`see here`: http://conversejs.org/tests.html
+.. _phantom.js: http://phantomjs.org
+.. _`Travis-CI`: https://travis-ci.org

bower.json

+{
+  "name": "converse",
+  "version": "0.5.0",
+  "devDependencies": {
+    "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
+  },
+  "dependencies": {
+    "requirejs": "2.1.8",
+    "jquery": "1.8.3",
+    "sjcl": "git://github.com/bitwiseshiftleft/sjcl.git",
+    "jed": "0.5.4",
+    "tinysort": "git://github.com/Sjeiti/TinySort.git",
+    "underscore": "1.5.1",
+    "backbone": "1.0.0",
+    "backbone.localStorage": "1.1.6",
+    "strophe": "git://github.com/strophe/strophejs.git#8e14efdf01856d184f6ba46b3b82c888beacdd98",
+    "strophe.roster": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/roster/strophe.roster.js",
+    "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js",
+    "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
+    "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js"
+  },
+  "exportsOverride": {
+  }
+}

build.js

-({
-    baseUrl: ".",
-    paths: {
-        "jquery": "Libraries/require-jquery",
-        "jed": "Libraries/jed",
-        "locales": "locale/locales",
-        "af": "locale/af/LC_MESSAGES/af",
-        "en": "locale/en/LC_MESSAGES/en",
-        "de": "locale/de/LC_MESSAGES/de",
-        "es": "locale/es/LC_MESSAGES/es",
-        "hu": "locale/hu/LC_MESSAGES/hu",
-        "it": "locale/it/LC_MESSAGES/it",
-        "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR", 
-        "sjcl": "Libraries/sjcl",
-        "tinysort": "Libraries/jquery.tinysort",
-        "underscore": "Libraries/underscore",
-        "backbone": "Libraries/backbone",
-        "localstorage": "Libraries/backbone.localStorage",
-        "strophe": "Libraries/strophe",
-        "strophe.muc": "Libraries/strophe.muc",
-        "strophe.roster": "Libraries/strophe.roster",
-        "strophe.vcard": "Libraries/strophe.vcard",
-        "strophe.disco": "Libraries/strophe.disco"
-    },
-    name: "main",
-    out: "converse.min.js"
-})

converse.css

+/*!
+ * Converse.js (Web-based XMPP instant messaging client)
+ * http://conversejs.org
+ *
+ * Copyright (c) 2012, Jan-Carel Brand <jc@opkode.com>
+ * Dual licensed under the MIT and GPL Licenses
+ */
+
 .hidden {
     display: none
 }

converse.js

@@ -12,47 +12,12 @@
         console = { log: function () {}, error: function () {} };
     }
     if (typeof define === 'function' && define.amd) {
-        require.config({
-            paths: {
-                "locales": "locale/locales",
-                "sjcl": "Libraries/sjcl",
-                "tinysort": "Libraries/jquery.tinysort",
-                "underscore": "Libraries/underscore",
-                "backbone": "Libraries/backbone",
-                "localstorage": "Libraries/backbone.localStorage",
-                "strophe": "Libraries/strophe",
-                "strophe.muc": "Libraries/strophe.muc",
-                "strophe.roster": "Libraries/strophe.roster",
-                "strophe.vcard": "Libraries/strophe.vcard",
-                "strophe.disco": "Libraries/strophe.disco"
-            },
-
-            // define module dependencies for modules not using define
-            shim: {
-                'backbone': {
-                    //These script dependencies should be loaded before loading
-                    //backbone.js
-                    deps: [
-                        'underscore',
-                        'jquery'
-                        ],
-                    //Once loaded, use the global 'Backbone' as the
-                    //module value.
-                    exports: 'Backbone'
-                },
-                'underscore':   { exports: '_' },
-                'strophe.muc':  { deps: ['strophe', 'jquery'] },
-                'strophe.roster':   { deps: ['strophe', 'jquery'] },
-                'strophe.vcard':    { deps: ['strophe', 'jquery'] },
-                'strophe.disco':    { deps: ['strophe', 'jquery'] }
-            }
-        });
-
         define("converse", [
             "locales",
             "localstorage",
             "tinysort",
             "sjcl",
+            "strophe",
             "strophe.muc",
             "strophe.roster",
             "strophe.vcard",
@@ -1869,7 +1834,7 @@
                 }
                 callback(jid, fullname, img, img_type, url);
             }, this), jid, errback);
-        }
+        };
 
         this.RosterItems = Backbone.Collection.extend({
             model: converse.RosterItem,
@@ -2350,7 +2315,7 @@
 
             setStatusMessage: function (ev) {
                 ev.preventDefault();
-                var status_message = $(ev.target).find('input').attr('value');
+                var status_message = $(ev.target).find('input').val();
                 if (status_message === "") {
                 }
                 this.model.setStatusMessage(status_message);