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

css/inverse.css

@@ -1949,6 +1949,9 @@ body {
         line-height: 22px; }
       #conversejs .chatbox .chat-body .chat-message .chat-msg-content {
         line-height: 22px; }
+        #conversejs .chatbox .chat-body .chat-message .chat-msg-content .emojione {
+          height: 22px;
+          margin-bottom: -5.5px; }
   #conversejs .chatbox .chat-content {
     padding: 0 1em 1em 1em;
     border-top-left-radius: 7px;

docs/source/_static/style.css

@@ -28,6 +28,28 @@ h5 {
     margin-right: 0.5em;
 }
 
+.nav-header {
+    font-weight: bold;
+    font-size: 110%;
+}
+
+.sidebar-title {
+    padding-left: 15px;
+}
+
+#sidebar > .nav-list {
+    height: 100vh;
+    overflow-y: scroll;
+}
+
+.bs-sidenav .nav .nav > li > a {
+    font-size: 100%;
+}
+.bs-sidenav .nav .nav .nav > li > a {
+    font-size: 90%;
+	color: gray;
+}
+
 /*
 Copyright (c) 2012 Terrence Ryan
 

docs/source/_templates/localtoc.html

+{#
+    basic/localtoc.html
+    ~~~~~~~~~~~~~~~~~~~
+
+    Sphinx sidebar template: local table of contents.
+
+    :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- if display_toc %}
+  <h3 class="sidebar-title"><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
+  {{ toc }}
+{%- endif %}

docs/source/builds.rst

@@ -47,7 +47,7 @@ This command does the following:
 
 * Also, the CSS files in the ``./css`` directory will be minified.
 
-The Javascript build files are contained in the ``./dist`` directory:
+The JavaScript build files are contained in the ``./dist`` directory:
 
 .. code-block:: bash
 

docs/source/conf.py

@@ -41,7 +41,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Converse.js'
-copyright = u'2014, JC Brand'
+copyright = u'2017, JC Brand'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -177,7 +177,7 @@ html_favicon = "_static/favicon.ico"
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {'**': ['localtoc.html', 'sourcelink.html', 'searchbox.html']}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

docs/source/configuration.rst

@@ -6,10 +6,6 @@
 Configuration
 =============
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 The included minified JS and CSS files can be used for demoing or testing, but
 you'll want to configure *Converse.js* to suit your needs before you deploy it
 on your website.
@@ -261,7 +257,7 @@ If ``authentication`` is set to ``anonymous``, then you will also need to provid
 server's domain via the `jid`_ setting.
 
 This is a useful setting if you'd like to create a custom login form in your
-website. You'll need to write some Javascript to accept that custom form's
+website. You'll need to write some JavaScript to accept that custom form's
 login credentials, then you can pass those credentials (``jid`` and
 ``password``) to ``converse.initialize`` to start converse.js and log the user
 into their XMPP account.
@@ -1341,7 +1337,7 @@ xhr_custom_status
 * Default:  ``false``
 
 .. note::
-    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous Javascript and XML).
+    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous JavaScript and XML).
 
 This option will let converse.js make an AJAX POST with your changed custom chat status to a
 remote server.
@@ -1350,7 +1346,7 @@ xhr_custom_status_url
 ---------------------
 
 .. note::
-    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous Javascript and XML).
+    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous JavaScript and XML).
 
 * Default:  Empty string
 
@@ -1367,7 +1363,7 @@ xhr_user_search
 * Default:  ``false``
 
 .. note::
-    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous Javascript and XML).
+    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous JavaScript and XML).
 
 There are two ways to add users.
 
@@ -1392,7 +1388,7 @@ xhr_user_search_url
 -------------------
 
 .. note::
-    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous Javascript and XML).
+    XHR stands for XMLHTTPRequest, and is meant here in the AJAX sense (Asynchronous JavaScript and XML).
 
 * Default:  Empty string
 

docs/source/developer_api.rst

@@ -6,10 +6,6 @@
 The converse.js developer API
 =============================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. note:: The API documented here is available in Converse.js 0.8.4 and higher.
         Earlier versions of Converse.js might have different API methods or none at all.
 
@@ -50,7 +46,7 @@ Public API methods
 ==================
 
 Publich API methods are those methods that are accessible on the global
-``window.converse`` object. They are public, because any Javascript in the page
+``window.converse`` object. They are public, because any JavaScript in the page
 can call them. Public methods therefore don't expose any sensitive or closured
 data. To do that, you'll need to create a plugin, which has access to the
 private API method.
@@ -325,7 +321,7 @@ room under the  ``with`` key.
 
 The ``start`` and ``end`` parameters are used to query for messages
 within a certain timeframe. The passed in date values may either be ISO8601
-formatted date strings, or Javascript Date objects.
+formatted date strings, or JavaScript Date objects.
 
 .. code-block:: javascript
 
@@ -1070,7 +1066,7 @@ Example:
 The **listen** grouping
 -----------------------
 
-Converse.js emits events to which you can subscribe from your own Javascript.
+Converse.js emits events to which you can subscribe from your own JavaScript.
 
 Concerning events, the following methods are available under the "listen"
 grouping:

docs/source/developer_guidelines.rst

@@ -5,11 +5,7 @@
 Developer guidelines
 ====================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
-If you want to work with the non-minified Javascript and CSS files you'll soon
+If you want to work with the non-minified JavaScript and CSS files you'll soon
 notice that there are references to a missing *node_modules* directory.
 Please follow the instructions below to create these directories and fetch Converse's
 3rd-party dependencies.
@@ -97,7 +93,7 @@ Without AMD and require.js
 Converse.js can also be used without require.js. If you for some reason prefer
 to use it this way, please refer to
 `non_amd.html <https://github.com/jcbrand/converse.js/blob/master/non_amd.html>`_
-for an example of how and in what order all the Javascript files that converse.js
+for an example of how and in what order all the JavaScript files that converse.js
 depends on need to be loaded.
 
 Brief description of converse.js's dependencies

docs/source/documentation.rst

@@ -6,10 +6,6 @@
 Writing Documentation
 =====================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. note:: Contributions to the documentation are much appreciated.
 
 What is used to write the documentation?

docs/source/events.rst

@@ -7,10 +7,6 @@
 Events and promises
 ===================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 Converse.js and its plugins emit various events which you can listen to via the
 :ref:`listen-grouping`.
 

docs/source/features.rst

@@ -6,10 +6,6 @@
 Features
 ========
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 Off-the-record encryption
 =========================
 
@@ -21,7 +17,7 @@ The OTR protocol not only **encrypts your messages**, it provides ways to
 **plausible deniability** and **perfect forward secrecy** by generating
 new encryption keys for each conversation.
 
-In its current state, Javascript cryptography is fraught with dangers and
+In its current state, JavaScript cryptography is fraught with dangers and
 challenges that make it impossible to reach the same standard of security that
 is available with native "desktop" software.
 
@@ -29,8 +25,8 @@ This is due to its runtime malleability, the way it is "installed" (e.g.
 served) and the browser's lack of cryptographic primitives needed to implement
 secure crypto.
 
-For harsh but fairly valid criticism of Javascript cryptography, read:
-`Javascript Cryptography Considered Harmful <http://www.matasano.com/articles/javascript-cryptography/>`_.
+For harsh but fairly valid criticism of JavaScript cryptography, read:
+`JavaScript Cryptography Considered Harmful <http://www.matasano.com/articles/javascript-cryptography/>`_.
 
 To get an idea on how this applies to OTR support in Converse.js, please read
 `my thoughts on it <https://opkode.com/media/blog/2013/11/11/conversejs-otr-support>`_.

docs/source/index.rst

@@ -23,7 +23,7 @@ Introduction
 ============
 
 Converse.js is a free and open-source `XMPP <http://xmpp.org/about-xmpp/>`_
-chat client written in Javascript which can be tightly integrated into any website.
+chat client written in JavaScript which can be tightly integrated into any website.
 
 The benefit of using converse.js as opposed to relying on a SaaS
 (software-as-a-service) solution, is that your users can have a much more

docs/source/manual.rst

@@ -10,10 +10,6 @@ The Converse.js User Manual
 
    <br />
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. figure:: images/homepage.jpg
    :align: right
    :alt: The converse.js website

docs/source/other_frameworks.rst

@@ -5,10 +5,6 @@
 Integrating converse.js into other frameworks
 =============================================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 Angular.js
 ----------
 

docs/source/quickstart.rst

@@ -13,7 +13,7 @@ Use the content delivery network
 --------------------------------
 
 Converse.js has a `CDN <https://en.wikipedia.org/wiki/Content_delivery_network>`_, provided by `KeyCDN <http://keycdn.com/>`_,
-which hosts its Javascript and CSS files.
+which hosts its JavaScript and CSS files.
 
 The latest versions of these files are available at these URLs:
 
@@ -44,7 +44,7 @@ Initializing Converse.js
 You'll then need to initialize Converse.js with configuration settings relevant to your requirements.
 Refer to the :ref:`configuration-settings` section for info on all the available configuration settings.
 
-To quickly get started, you can put the following Javascript code at the
+To quickly get started, you can put the following JavaScript code at the
 bottom of your page (after the closing *</body>* element)::
 
     <script>
@@ -75,7 +75,7 @@ for an example of this build being used. There's an additional CSS file called
 ``mobile.min.css`` which should be used with the mobile build.
 
 When you load `conversejs.org <https://conversejs.org>`_ with a mobile device
-then the mobile Javascript build and its CSS will be used.
+then the mobile JavaScript build and its CSS will be used.
 
 Excluding 3rd party dependencies
 --------------------------------

docs/source/security.rst

@@ -57,7 +57,7 @@ Addititional measures
 Besides the measures mentioned above, integrators and hosts can also take
 further security precautions.
 
-The most effective is to avoid serving untrusted 3rd party Javascript (e.g.
+The most effective is to avoid serving untrusted 3rd party JavaScript (e.g.
 advertisements and analytics).
 
 Another option is to forego the use of a global ``converse`` object (which

docs/source/setup.rst

@@ -6,10 +6,6 @@
 Setup and integration
 =====================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. _what-you-will-need:
 
 ------------------

docs/source/style_guide.rst

@@ -5,19 +5,15 @@
 Software Style Guide
 ====================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. note:: Converse.js doesn't yet use any of the new `ES2015
     <https://babeljs.io/docs/learn-es2015/>`_ features, because we don't
     rely on a transpiler and still support older browsers.
 
 Most of the style guide recommendations here come from Douglas Crockford's book
-`Javascript, the good parts <http://shop.oreilly.com/product/9780596517748.do>`_
+`JavaScript, the good parts <http://shop.oreilly.com/product/9780596517748.do>`_
 
 This style guide is fairly opinionated. Some of these opinions perhaps don't
-conform to your expectations on how Javascript code should look like.
+conform to your expectations on how JavaScript code should look like.
 I apologize for that. However, for the sake of sanity, consistency and having
 code that is pleasing to the eye, please stick to these guidelines.
 
@@ -103,7 +99,7 @@ and method invocations.
 Checking for equality
 ---------------------
 
-Javascript has a strict ``===`` and less strict ``==`` equality operator. The
+JavaScript has a strict ``===`` and less strict ``==`` equality operator. The
 stricter equality operator also does type checking. To avoid subtle bugs when
 doing comparisons, always use the strict equality check.
 

docs/source/theming.rst

@@ -8,10 +8,6 @@
 Theming
 =======
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 Setting up your environment
 ===========================
 
@@ -71,7 +67,7 @@ Creating dist files
 ===================
 
 Once you've themed converse.js, you'll want to create new minified distribution
-files of all the Javascript and CSS.
+files of all the JavaScript and CSS.
 
 Please refer to the :doc:`builds` section for information on how this is done.
 

docs/source/translations.rst

@@ -6,10 +6,6 @@
 Translations
 ============
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 .. note::
    Translations take up a lot of space and will bloat your minified file.
    At the time of writing, all the translations add about 50KB of extra data to
@@ -59,7 +55,7 @@ translated into, do the following
 
 Please make sure to add the following attributes at the top of the file (under
 *Content-Transfer-Encoding*). They are required as configuration settings for Jed,
-the Javascript translations library that we're using.
+the JavaScript translations library that we're using.
 
 .. code-block:: po
 
@@ -90,7 +86,7 @@ The resulting `.po` file is then what gets translated.
 
 
 -----------------------------------------------------
-Generating a Javascript file from a translations file
+Generating a JavaScript file from a translations file
 -----------------------------------------------------
 
 Unfortunately `Jed <http://slexaxton.github.io/Jed>`_, which we use for

docs/source/troubleshooting.rst

@@ -6,10 +6,6 @@
 Troubleshooting and debugging
 =============================
 
-.. contents:: Table of Contents
-   :depth: 2
-   :local:
-
 General tips on debugging Converse.js
 =====================================
 
@@ -42,13 +38,13 @@ more likely on the XMPP server's end (perhaps a misconfiguration?). If they
 **are** logged, then there might be a bug or misconfiguration in Converse.js.
 
 
-Conflicts with other Javascript libraries
+Conflicts with other JavaScript libraries
 =========================================
 
 Problem: 
 ---------
 
-You are using other Javascript libraries (like JQuery plugins), and
+You are using other JavaScript libraries (like JQuery plugins), and
 get errors like these in your browser console::
 
     Uncaught TypeError: Object [object Object] has no method 'xxx' from example.js

index.html

@@ -12,11 +12,11 @@
     <link type="text/css" rel="stylesheet" media="screen" href="css/bootstrap.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/font-awesome.min.css" />
     <link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
     <script type="text/javascript" src="analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
 	<script src="src/website.js"></script>
     <![if gte IE 11]>
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
 	<script src="dist/converse.min.js"></script>
     <![endif]>
 </head>

sass/inverse/_chatbox.scss

@@ -51,6 +51,10 @@
                 }
                 .chat-msg-content {
                     line-height: $line-height;
+                    .emojione {
+                        height: $line-height;
+                        margin-bottom: -$line-height/4;
+                    }
                 }
             }
         }