Merge remote-tracking branch 'origin' into 0.8

Conflicts: converse.js docs/CHANGES.rst index.html

Merge remote-tracking branch 'origin' into 0.8
Conflicts: converse.js docs/CHANGES.rst index.html
1ce7620b · JC Brand · 319a955f · 839dd0bd · 1ce7620b · 1ce7620b
Commit 1ce7620b authored Feb 23, 2014 by JC Brand
36 changed files
--- a/README.rst
+++ b/README.rst
@@ -29,7 +29,7 @@ It has the following features:
 * Custom status messages
 * Typing notifications
 * Third person messages (/me )
-* Translated into multiple languages  (af, de, es, fr, it, hu, pt-BR, ru)
+* Translated into multiple languages  (af, de, en, es, fr, he, hu, id, it, ja, nl, pt_BR, ru)
 * Off-the-record encryption support (via `OTR.js <http://arlolra.github.io/otr>`_)

 -----------
@@ -88,9 +88,16 @@ Licence

 ``Converse.js`` is released under both the MIT_ and GPL_ licenses.

------
-Donate
------
+-------
+Support
+-------
+
+For support queries and discussions, please join the mailing list: conversejs@librelist.com
+Issues can be logged on the `Github issue tracker <https://github.com/jcbrand/converse.js/issues>`_.
+
+---------------------------------
+Donations or tips are appreciated
+---------------------------------

 * Bitcoin: 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS
 * Litecoin: LLvLH6qJch7HAamLguHkwobCrxmHLhiwZw

--- a/bower.json
+++ b/bower.json
 {
  "name": "converse",
-  "version": "0.7.2",
+  "version": "0.7.3",
  "devDependencies": {
    "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
    "otr": "0.2.7",

--- a/builds/converse-no-locales-no-otr.min.js
+++ b/builds/converse-no-locales-no-otr.min.js
--- a/builds/converse-no-otr.min.js
+++ b/builds/converse-no-otr.min.js
--- a/builds/converse.min.js
+++ b/builds/converse.min.js
--- a/converse.css
+++ b/converse.css
@@ -333,22 +333,18 @@ you can use the generic selector below, but it's slower:

 span.spinner {
    background: url(images/spinner.gif) no-repeat center;
-    width: 22px;
    height: 22px;
    padding: 0 2px 0 2px;
    display: block;
 }

 span.spinner.centered {
-    position: absolute;
-    top: 30%;
-    left: 50%;
-    margin: 0 0 0 -25%;
+    text-align: center;
+    padding-top: 5em;
 }

 span.spinner.hor_centered {
-    left: 40%;
-    position: absolute;
+    text-align: center;
 }

 #toggle-controlbox {
@@ -1157,6 +1153,7 @@ ul.chat-toolbar li {
    list-style: none;
    padding: 0 3px 0 3px;
    cursor: pointer; 
+    margin-top: 1px;
 }

 ul.chat-toolbar li:hover {

--- a/converse.js
+++ b/converse.js
--- a/converse.min.css
+++ b/converse.min.css
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -7,11 +7,16 @@ Changelog
 * Chat boxes and rooms can now be resized vertically. [jcbrand]
 * Chat boxes and rooms can be minimized. [jcbrand]

-0.7.3 (Unreleased)
+0.7.3 (2014-02-23)
 ------------------

-* Option to display a call button in the chatbox toolbar, to allow third-party libraries to provide a calling feature. [Aupajo]
-* #108 Japanese Translations. [mako09]
+* #93 Add API methods exposing the RID and SID values. Can be disabled. [jcbrand]
+* #102 Option to enable OTR by default. [Aupajo]
+* #103 Option to display a call button in the chatbox toolbar, to allow third-party libraries to provide a calling feature. [Aupajo]
+* #108 Japanese Translations [mako09]
+* #111 OTR not working when using converse.js with prebinding. [jseidl, jcbrand]
+* #114, #124 Hewbrew Translations [GreenLunar]
+* #115 Indonesian Translations [priyadi]

 0.7.2 (2013-12-18)
 ------------------

--- a/docs/doctrees/index.doctree
+++ b/docs/doctrees/index.doctree
--- a/docs/html/.buildinfo
+++ b/docs/html/.buildinfo
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 652c197d955de4d2c90bb99dc6534a15
+config: 738ca7b60aed811ee1668ad08d26eabb
 tags: fbb0d17656682115ca4d033fb2f83ba1
--- a/docs/html/_sources/index.txt
+++ b/docs/html/_sources/index.txt
--- a/docs/html/genindex.html
+++ b/docs/html/genindex.html
@@ -9,7 +9,7 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    
-    <title>Index &mdash; Converse.js 0.7.1 documentation</title>
+    <title>Index &mdash; Converse.js 0.7.3 documentation</title>
    
    <link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -17,7 +17,7 @@
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
-        VERSION:     '0.7.1',
+        VERSION:     '0.7.3',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
@@ -26,7 +26,7 @@
    <script type="text/javascript" src="_static/jquery.js"></script>
    <script type="text/javascript" src="_static/underscore.js"></script>
    <script type="text/javascript" src="_static/doctools.js"></script>
-    <link rel="top" title="Converse.js 0.7.1 documentation" href="index.html" /> 
+    <link rel="top" title="Converse.js 0.7.3 documentation" href="index.html" /> 
  </head>
  <body>
    <div id="header_wrap" class="outer">
@@ -51,7 +51,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="#" title="General Index"
             accesskey="I">index</a></li>
-        <li><a href="index.html">Converse.js 0.7.1 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
 <section id="main_content" class="inner">  
@@ -80,7 +80,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="#" title="General Index"
             >index</a></li>
-        <li><a href="index.html">Converse.js 0.7.1 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
 </div>

--- a/docs/html/index.html
+++ b/docs/html/index.html
--- a/docs/html/objects.inv
+++ b/docs/html/objects.inv
 # Sphinx inventory version 2
 # Project: Converse.js
-# Version: 0.7.1
+# Version: 0.7.3
 # The remainder of this file is compressed using zlib.
 xm
 {"];

--- a/docs/html/search.html
+++ b/docs/html/search.html
@@ -7,7 +7,7 @@
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    
-    <title>Search &mdash; Converse.js 0.7.1 documentation</title>
+    <title>Search &mdash; Converse.js 0.7.3 documentation</title>
    
    <link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
    <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
    <script type="text/javascript">
      var DOCUMENTATION_OPTIONS = {
        URL_ROOT:    '',
-        VERSION:     '0.7.1',
+        VERSION:     '0.7.3',
        COLLAPSE_INDEX: false,
        FILE_SUFFIX: '.html',
        HAS_SOURCE:  true
@@ -25,7 +25,7 @@
    <script type="text/javascript" src="_static/underscore.js"></script>
    <script type="text/javascript" src="_static/doctools.js"></script>
    <script type="text/javascript" src="_static/searchtools.js"></script>
-    <link rel="top" title="Converse.js 0.7.1 documentation" href="index.html" />
+    <link rel="top" title="Converse.js 0.7.3 documentation" href="index.html" />
  <script type="text/javascript">
    jQuery(function() { Search.loadIndex("searchindex.js"); });
  </script>
@@ -55,7 +55,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="genindex.html" title="General Index"
             accesskey="I">index</a></li>
-        <li><a href="index.html">Converse.js 0.7.1 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
 <section id="main_content" class="inner">  
@@ -100,7 +100,7 @@
        <li class="right" style="margin-right: 10px">
          <a href="genindex.html" title="General Index"
             >index</a></li>
-        <li><a href="index.html">Converse.js 0.7.1 documentation</a> &raquo;</li> 
+        <li><a href="index.html">Converse.js 0.7.3 documentation</a> &raquo;</li> 
      </ul>
    </div>
 </div>

--- a/docs/html/searchindex.js
+++ b/docs/html/searchindex.js
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '0.7.2'
+version = '0.7.3'
 # The full version, including alpha/beta/rc tags.
-release = '0.7.2'
+release = '0.7.3'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/docs/source/index.rst
+++ b/docs/source/index.rst
--- a/index.html
+++ b/index.html
@@ -7,8 +7,8 @@
    <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.css">
-    <script data-main="main" src="components/requirejs/require.js"></script>
-    <!--<script src="builds/converse.min.js"></script>-->
+    <!--<script data-main="main" src="components/requirejs/require.js"></script>-->
+    <script src="builds/converse.min.js"></script>
    <title>Converse.js</title>
 </head>

@@ -54,7 +54,7 @@
        <li>Custom status messages</li>
        <li>Typing notifications</li>
        <li>Third person messages (/me )</li>
-        <li>Translated into multiple languages  (af, de, es, fr, hu, it, nl, pt-BR, ru)</li>
+        <li>Translated into multiple languages  (af, de, en, es, fr, he, hu, id, it, ja, nl, pt_BR, ru)</li>
        <li>Off-the-record encryption (via <a href="http://arlolra.github.io/otr/" target="_blank">OTR.js</a>)</li>
    </ul>

@@ -159,9 +159,17 @@
    You can:
    <ul>
        <li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank">Twitter</a></li>
-        <li>Chat via <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">XMPP/Jabber</a></li>
-        <li>Send me an email via this <a href="http://opkode.com/contact" target="_blank">contact form</a>.</li>
+        <li>Chat with me via XMPP: <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a></li>
    <ul>
+    <p>
+        For <strong>support queries</strong>, please write to the mailing list: <a href="mailto:conversejs@librelist.com">conversejs@librelist.com</a>
+    </p>
+    <p>
+        Please <a target="_blank" href="https://github.com/jcbrand/converse.js/issues">file <strong>bugs</strong> on Github</a>.
+    </p>
+    <p>
+        I'm available for special features and consulting work. Please <a href="http://opkode.com/contact" target="_blank">contact me here</a>.
+    </p>
 </section>
 </div>

@@ -186,7 +194,7 @@
            allow_otr: true,
            auto_list_rooms: false,
            auto_subscribe: false,
-            bosh_service_url: 'http://devbox:8890/http-bind', // Please use this connection manager only for testing purposes
+            bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
            debug: true ,
            hide_muc_server: false,
            i18n: locales['en'], // Refer to ./locale/locales.js to see which locales are supported

--- a/locale/converse.pot
+++ b/locale/converse.pot
--- a/locale/he/LC_MESSAGES/converse.json
+++ b/locale/he/LC_MESSAGES/converse.json
--- a/locale/he/LC_MESSAGES/converse.po
+++ b/locale/he/LC_MESSAGES/converse.po
--- a/locale/he/LC_MESSAGES/he.js
+++ b/locale/he/LC_MESSAGES/he.js
--- a/locale/id/LC_MESSAGES/converse.json
+++ b/locale/id/LC_MESSAGES/converse.json
--- a/locale/id/LC_MESSAGES/converse.po
+++ b/locale/id/LC_MESSAGES/converse.po
--- a/locale/id/LC_MESSAGES/id.js
+++ b/locale/id/LC_MESSAGES/id.js
--- a/locale/locales.js
+++ b/locale/locales.js
@@ -14,7 +14,9 @@
            "en": "locale/en/LC_MESSAGES/en",
            "es": "locale/es/LC_MESSAGES/es",
            "fr": "locale/fr/LC_MESSAGES/fr",
+            "he": "locale/he/LC_MESSAGES/he",
            "hu": "locale/hu/LC_MESSAGES/hu",
+            "id": "locale/id/LC_MESSAGES/id",
            "it": "locale/it/LC_MESSAGES/it",
            "ja": "locale/ja/LC_MESSAGES/ja",
            "nl": "locale/nl/LC_MESSAGES/nl",
@@ -30,20 +32,24 @@
        'en',
        'es',
        'fr',
+        'he',
        'hu',
+        'id',
        'it',
        'ja',
        'nl',
        'pt_BR',
        'ru'
-        ], function (jed, af, de, en, es, fr, hu, it, ja, nl, pt_BR, ru) {
+        ], function (jed, af, de, en, es, fr, he, hu, id, it, ja, nl, pt_BR, ru) {
            root.locales = {
                'af': af,
                'de': de,
                'en': en,
                'es': es,
                'fr': fr,
+                'he': he,
                'hu': hu,
+                'id': id,
                'it': it,
                'ja': ja,
                'nl': nl,

--- a/package.json
+++ b/package.json
 {
  "name": "converse.js",
-  "version": "0.7.2",
+  "version": "0.7.3",
  "description": "Browser based XMPP instant messaging client",
  "main": "main.js",
  "directories": {

--- a/spec/converse.js
+++ b/spec/converse.js
@@ -8,60 +8,40 @@
    );
 } (this, function (mock, utils) {
    return describe("Converse", $.proxy(function(mock, utils) {
-        window.localStorage.clear();

-        it("allows you to subscribe to emitted events", function () {
-            this.callback = function () {};
-            spyOn(this, 'callback');
-            converse.on('onInitialized', this.callback);
-            converse.emit('onInitialized');
-            expect(this.callback).toHaveBeenCalled();
-            converse.emit('onInitialized');
-            expect(this.callback.callCount, 2);
-            converse.emit('onInitialized');
-            expect(this.callback.callCount, 3);
-        });
-
-        it("allows you to listen once for an emitted event", function () {
-            this.callback = function () {};
-            spyOn(this, 'callback');
-            converse.once('onInitialized', this.callback);
-            converse.emit('onInitialized');
-            expect(this.callback).toHaveBeenCalled();
-            converse.emit('onInitialized');
-            expect(this.callback.callCount, 1);
-            converse.emit('onInitialized');
-            expect(this.callback.callCount, 1);
-        });
-
-        it("allows you to stop listening or subscribing to an event", function () {
-            this.callback = function () {};
-            this.anotherCallback = function () {};
-            this.neverCalled = function () {};
-
-            spyOn(this, 'callback');
-            spyOn(this, 'anotherCallback');
-            spyOn(this, 'neverCalled');
-            converse.on('onInitialized', this.callback);
-            converse.on('onInitialized', this.anotherCallback);
-
-            converse.emit('onInitialized');
-            expect(this.callback).toHaveBeenCalled();
-            expect(this.anotherCallback).toHaveBeenCalled();
-
-            converse.off('onInitialized', this.callback);
-
-            converse.emit('onInitialized');
-            expect(this.callback.callCount, 1);
-            expect(this.anotherCallback.callCount, 2);
-
-            converse.once('onInitialized', this.neverCalled);
-            converse.off('onInitialized', this.neverCalled);
-
-            converse.emit('onInitialized');
-            expect(this.callback.callCount, 1);
-            expect(this.anotherCallback.callCount, 3);
-            expect(this.neverCalled).not.toHaveBeenCalled();
-        });
+        beforeEach($.proxy(function () {
+            window.localStorage.clear();
+            window.sessionStorage.clear();
+        }, converse));
+
+        it("has an API method for retrieving the next RID", $.proxy(function () {
+            var old_connection = converse.connection;
+            converse.connection.rid = '1234';
+            converse.expose_rid_and_sid = false;
+            expect(converse_api.getRID()).toBe(null);
+
+            converse.expose_rid_and_sid = true;
+            expect(converse_api.getRID()).toBe('1234');
+
+            converse.connection = undefined;
+            expect(converse_api.getRID()).toBe(null);
+            // Restore the connection
+            converse.connection = old_connection;
+        }, converse));
+
+        it("has an API method for retrieving the SID", $.proxy(function () {
+            var old_connection = converse.connection;
+            converse.connection.sid = '1234';
+            converse.expose_rid_and_sid = false;
+            expect(converse_api.getSID()).toBe(null);
+
+            converse.expose_rid_and_sid = true;
+            expect(converse_api.getSID()).toBe('1234');
+
+            converse.connection = undefined;
+            expect(converse_api.getSID()).toBe(null);
+            // Restore the connection
+            converse.connection = old_connection;
+        }, converse));
    }, converse, mock, utils));
 }));
--- a/spec/eventemitter.js
+++ b/spec/eventemitter.js
+(function (root, factory) {
+    define([
+        "mock",
+        "utils"
+        ], function (mock, utils) {
+            return factory(mock, utils);
+        }
+    );
+} (this, function (mock, utils) {
+    return describe("The Converse Event Emitter", $.proxy(function(mock, utils) {
+        window.localStorage.clear();
+
+        it("allows you to subscribe to emitted events", function () {
+            this.callback = function () {};
+            spyOn(this, 'callback');
+            converse.on('onInitialized', this.callback);
+            converse.emit('onInitialized');
+            expect(this.callback).toHaveBeenCalled();
+            converse.emit('onInitialized');
+            expect(this.callback.callCount, 2);
+            converse.emit('onInitialized');
+            expect(this.callback.callCount, 3);
+        });
+
+        it("allows you to listen once for an emitted event", function () {
+            this.callback = function () {};
+            spyOn(this, 'callback');
+            converse.once('onInitialized', this.callback);
+            converse.emit('onInitialized');
+            expect(this.callback).toHaveBeenCalled();
+            converse.emit('onInitialized');
+            expect(this.callback.callCount, 1);
+            converse.emit('onInitialized');
+            expect(this.callback.callCount, 1);
+        });
+
+        it("allows you to stop listening or subscribing to an event", function () {
+            this.callback = function () {};
+            this.anotherCallback = function () {};
+            this.neverCalled = function () {};
+
+            spyOn(this, 'callback');
+            spyOn(this, 'anotherCallback');
+            spyOn(this, 'neverCalled');
+            converse.on('onInitialized', this.callback);
+            converse.on('onInitialized', this.anotherCallback);
+
+            converse.emit('onInitialized');
+            expect(this.callback).toHaveBeenCalled();
+            expect(this.anotherCallback).toHaveBeenCalled();
+
+            converse.off('onInitialized', this.callback);
+
+            converse.emit('onInitialized');
+            expect(this.callback.callCount, 1);
+            expect(this.anotherCallback.callCount, 2);
+
+            converse.once('onInitialized', this.neverCalled);
+            converse.off('onInitialized', this.neverCalled);
+
+            converse.emit('onInitialized');
+            expect(this.callback.callCount, 1);
+            expect(this.anotherCallback.callCount, 3);
+            expect(this.neverCalled).not.toHaveBeenCalled();
+        });
+    }, converse, mock, utils));
+}));
--- a/spec/otr.js
+++ b/spec/otr.js
+(function (root, factory) {
+    define([
+        "mock",
+        "utils"
+        ], function (mock, utils) {
+            return factory(mock, utils);
+        }
+    );
+} (this, function (mock, utils) {
+    return describe("The OTR module", $.proxy(function(mock, utils) {
+
+        beforeEach($.proxy(function () {
+            window.localStorage.clear();
+            window.sessionStorage.clear();
+        }, converse));
+
+        it("can store a session passphrase in session storage", $.proxy(function () {
+            var pp;
+            // With no prebind, the user's XMPP password is used and nothing is
+            // stored in session storage.
+            this.prebind = false;
+            this.connection.pass = 's3cr3t!';
+            expect(this.otr.getSessionPassphrase()).toBe(this.connection.pass);
+            expect(window.sessionStorage.length).toBe(0); 
+            expect(window.localStorage.length).toBe(0); 
+
+            // With prebind, a random passphrase is generated and stored in
+            // session storage.
+            this.prebind = true;
+            pp = this.otr.getSessionPassphrase();
+            expect(pp).not.toBe(this.connection.pass);
+            expect(window.sessionStorage.length).toBe(1);
+            expect(window.localStorage.length).toBe(0); 
+            expect(pp).toBe(window.sessionStorage[hex_sha1(converse.connection.jid)]);
+
+            // Clean up
+            this.prebind = false;
+        }, converse));
+    }, converse, mock, utils));
+}));
--- a/src/build-no-locales-no-otr.js
+++ b/src/build-no-locales-no-otr.js
--- a/src/build-no-otr.js
+++ b/src/build-no-otr.js
--- a/src/build.js
+++ b/src/build.js
--- a/tests_main.js
+++ b/tests_main.js