New release 4.0.2

CHANGES.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 4.0.2 (Unreleased)
+## 4.0.2 (2018-10-02)
 
 - M4A and WEBM files, when sent as XEP-0066 Out of Band Data, are now playable directly in chat
 - Updated French and Spanish translations

COPYRIGHT

@@ -2,9 +2,9 @@
  *
  *  An XMPP chat client that runs in the browser.
  *
- *  Version: 4.0.1
+ *  Version: 4.0.2
  *
- *  Copyright: JC Brand 2012-2017
+ *  Copyright: JC Brand 2013-2018
  *  Except for 3rd party dependencies.
  *  Please refer to the unminified version of this file for details.
  *

Makefile

@@ -71,7 +71,7 @@ serve_bg: dev
 ########################################################################
 ## Translation machinery
 
-GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.0.1 -c
+GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.0.2 -c
 
 .PHONY: pot
 pot: dist/converse-no-dependencies-es2015.js

dist/converse-no-dependencies.js

@@ -33199,7 +33199,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           }
         },
         setVCard: function setVCard() {
-          if (this.get('type') === 'groupchat') {
+          if (this.get('type') === 'error') {
+            return;
+          } else if (this.get('type') === 'groupchat') {
             this.vcard = this.getVCardForChatroomOccupant();
           } else {
             var jid = this.get('from');
@@ -40280,7 +40282,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           'click .chat-msg__edit-modal': 'showMessageVersionsModal'
         },
         initialize: function initialize() {
-          this.model.vcard.on('change', this.render, this);
+          if (this.model.vcard) {
+            this.model.vcard.on('change', this.render, this);
+          }
+
           this.model.on('change:correcting', this.onMessageCorrection, this);
           this.model.on('change:message', this.render, this);
           this.model.on('change:progress', this.renderFileUploadProgresBar, this);
@@ -40334,7 +40339,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
           var is_me_message = this.isMeCommand(),
               moment_time = moment(this.model.get('time')),
-              role = this.model.vcard.get('role'),
+              role = this.model.vcard ? this.model.vcard.get('role') : null,
               roles = role ? role.split(',') : [];
           var msg = u.stringToElement(tpl_message(_.extend(this.model.toJSON(), {
             '__': __,
@@ -45594,7 +45599,6 @@ function _instanceof(left, right) { if (right != null && typeof Symbol !== "unde
               algo = {
             'name': 'AES-GCM',
             'iv': iv,
-            'additionalData': new Uint8Array(1),
             'tagLength': TAG_LENGTH
           },
               encrypted = await crypto.subtle.encrypt(algo, key, u.stringToArrayBuffer(plaintext)),
@@ -45616,7 +45620,6 @@ function _instanceof(left, right) { if (right != null && typeof Symbol !== "unde
               algo = {
             'name': "AES-GCM",
             'iv': u.base64ToArrayBuffer(obj.iv),
-            'additionalData': new Uint8Array(1),
             'tagLength': TAG_LENGTH
           };
           return u.arrayBufferToString((await crypto.subtle.decrypt(algo, key_obj, cipher)));

docs/source/conf.py

@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '4.0.1'
+version = '4.0.2'
 # The full version, including alpha/beta/rc tags.
-release = '4.0.1'
+release = '4.0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/quickstart.rst

@@ -25,8 +25,8 @@ breakage when a new version is released and the above URLs load new resources.
 
 To load a specific version of Converse you can put the version in the URL, like so:
 
-* https://cdn.conversejs.org/4.0.1/dist/converse.min.js
-* https://cdn.conversejs.org/4.0.1/css/converse.min.css
+* https://cdn.conversejs.org/4.0.2/dist/converse.min.js
+* https://cdn.conversejs.org/4.0.2/css/converse.min.css
 
 You can include these two URLs inside the *<head>* element of your website
 via the *script* and *link* tags:

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "converse.js",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Browser based XMPP chat client",
   "main": "dist/converse.js",
   "directories": {

sass/_chatbox.scss

@@ -620,6 +620,7 @@
             overflow: hidden;
         }
         .chat-body {
+            height: calc(100% - #{$fullpage-chat-head-height});
             background-color: $chat-head-color;
             border-top-left-radius: $chatbox-border-radius;
             border-top-right-radius: $chatbox-border-radius;

src/converse-omemo.js

@@ -927,10 +927,6 @@
             });
 
 
-            _converse.omemo = {
-
-            }
-
             function fetchDeviceLists () {
                 return new Promise((resolve, reject) => _converse.devicelists.fetch({
                     'success': resolve