Merge remote-tracking branch 'origin/master'

src/build-inverse.js

@@ -4,9 +4,11 @@
     mainConfigFile: 'config.js',
     paths: {
         "converse-bookmarks":       "builds/converse-bookmarks",
+        "converse-chatboxes":       "builds/converse-chatboxes",
         "converse-chatview":        "builds/converse-chatview",
         "converse-controlbox":      "builds/converse-controlbox",
         "converse-core":            "builds/converse-core",
+        "converse-disco":           "builds/converse-disco",
         "converse-dragresize":      "builds/converse-dragresize",
         "converse-headline":        "builds/converse-headline",
         "converse-inverse":         "builds/converse-inverse",

src/build.js

@@ -4,9 +4,11 @@
     mainConfigFile: 'config.js',
     paths: {
         "converse-bookmarks":       "builds/converse-bookmarks",
+        "converse-chatboxes":       "builds/converse-chatboxes",
         "converse-chatview":        "builds/converse-chatview",
         "converse-controlbox":      "builds/converse-controlbox",
         "converse-core":            "builds/converse-core",
+        "converse-disco":           "builds/converse-disco",
         "converse-dragresize":      "builds/converse-dragresize",
         "converse-headline":        "builds/converse-headline",
         "converse-inverse":         "builds/converse-inverse",
@@ -22,7 +24,8 @@
         "converse-rosterview":      "builds/converse-rosterview",
         "converse-singleton":       "builds/converse-singleton",
         "converse-vcard":           "builds/converse-vcard",
-        "utils":                    "builds/utils"
+        "utils":                    "builds/utils",
+        "form-utils":               "builds/form-utils"
     },
     wrap: {
         startFile: "start.frag",

src/converse-otr.js

@@ -21,9 +21,10 @@
 
     const { Strophe, utils, b64_sha1, _ } = converse.env;
 
-    const HAS_CSPRNG = ((!_.isUndefined(crypto)) &&
-        ((_.isFunction(crypto.randomBytes)) || (_.isFunction(crypto.getRandomValues))
-    ));
+    const HAS_CSPRNG = _.isUndefined(window.crypto) ? false : (
+        _.isFunction(window.crypto.randomBytes) ||
+        _.isFunction(window.crypto.getRandomValues)
+    );
 
     const HAS_CRYPTO = HAS_CSPRNG && (
         (!_.isUndefined(otr.OTR)) &&

src/lodash.fp.js

 define(['lodash', 'lodash.converter', 'converse-core'], function (_, lodashConverter, converse) {
-    const fp = lodashConverter(_.runInContext());
+    var fp = lodashConverter(_.runInContext());
     converse.env.fp = fp;
     return fp;
 });

src/polyfill.js

+if (!String.prototype.includes) {
+  String.prototype.includes = function(search, start) {
+        'use strict';
+        if (typeof start !== 'number') {
+            start = 0;
+        }
+        if (start + search.length > this.length) {
+            return false;
+        } else {
+            return this.indexOf(search, start) !== -1;  // eslint-disable-line lodash/prefer-includes
+        }
+  };
+}
+
 if (!String.prototype.endsWith) {
   String.prototype.endsWith = function (searchString, position) {
       var subjectString = this.toString();