From 0424df9edc63de877032479a4d25e4485e31428a Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 20 Dec 2016 09:30:20 +0000
Subject: [PATCH] Rename the closured converse object to _converse

to indicate that it's private and to differentiate it from the outer "global"
converse object.
---
 spec/chatbox.js              | 6 ++++++
 spec/transcripts.js          | 1 +
 src/converse-chatview.js     | 1 +
 src/converse-controlbox.js   | 1 -
 src/converse-core.js         | 1 -
 src/converse-dragresize.js   | 1 -
 src/converse-headline.js     | 4 ++--
 src/converse-minimize.js     | 1 -
 src/converse-muc.js          | 1 -
 src/converse-notification.js | 1 -
 src/converse-otr.js          | 1 +
 11 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/spec/chatbox.js b/spec/chatbox.js
index 3863c2406..867e806cb 100644
--- a/spec/chatbox.js
+++ b/spec/chatbox.js
@@ -756,6 +756,12 @@
                     }));
                 });
 
+                describe("when sent by the current user", function () {
+                    it("will always cause the chat area to be scrolled down", mock.initConverse(function (_converse) {
+                        // TODO
+                    }));
+                });
+
                 it("is ignored if it's a malformed headline message", mock.initConverse(function (_converse) {
                     test_utils.createContacts(_converse, 'current');
                     test_utils.openControlBox();
diff --git a/spec/transcripts.js b/spec/transcripts.js
index 4d19caf02..ffe1341b3 100644
--- a/spec/transcripts.js
+++ b/spec/transcripts.js
@@ -3,6 +3,7 @@
     define([
         "converse_api",
         "mock",
+        "converse_api",
         "test_utils",
         "utils",
         "transcripts"
diff --git a/src/converse-chatview.js b/src/converse-chatview.js
index 23c4ddabb..188bcec3c 100644
--- a/src/converse-chatview.js
+++ b/src/converse-chatview.js
@@ -32,6 +32,7 @@
         $msg = converse.env.$msg,
         _ = converse.env._,
         moment = converse.env.moment;
+
     var KEY = {
         ENTER: 13,
         FORWARD_SLASH: 47
diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js
index 53e681c33..e93c6dfa7 100644
--- a/src/converse-controlbox.js
+++ b/src/converse-controlbox.js
@@ -44,7 +44,6 @@
     "use strict";
 
     var USERS_PANEL_ID = 'users';
-
     // Strophe methods for building stanzas
     var Strophe = converse.env.Strophe,
         utils = converse.env.utils;
diff --git a/src/converse-core.js b/src/converse-core.js
index c0a00ce9e..da1f1732a 100755
--- a/src/converse-core.js
+++ b/src/converse-core.js
@@ -394,7 +394,6 @@
             _converse._tearDown();
             _converse.chatboxviews.closeAllChatBoxes();
             _converse.emit('disconnected');
-            return 'disconnected';
         };
 
         this.onDisconnected = function () {
diff --git a/src/converse-dragresize.js b/src/converse-dragresize.js
index ae1f303f8..af19d1100 100644
--- a/src/converse-dragresize.js
+++ b/src/converse-dragresize.js
@@ -311,7 +311,6 @@
              * loaded by converse.js's plugin machinery.
              */
             var _converse = this._converse;
-
             // Add new HTML template
             _converse.templates.dragresize = tpl_dragresize;
 
diff --git a/src/converse-headline.js b/src/converse-headline.js
index 7f2b0ff99..cd1056fb4 100644
--- a/src/converse-headline.js
+++ b/src/converse-headline.js
@@ -22,13 +22,13 @@
          */
         var from_jid = message.getAttribute('from');
         if (utils.isHeadlineMessage(message)) {
-            converse.chatboxes.create({
+            _converse.chatboxes.create({
                 'id': from_jid,
                 'jid': from_jid,
                 'fullname':  from_jid,
                 'type': 'headline'
             }).createMessage(message, undefined, message);
-            converse.emit('message', message);
+            _converse.emit('message', message);
         }
         return true;
     };
diff --git a/src/converse-minimize.js b/src/converse-minimize.js
index cd44d5e11..b60107c02 100644
--- a/src/converse-minimize.js
+++ b/src/converse-minimize.js
@@ -31,7 +31,6 @@
         moment = converse.env.moment;
 
     converse.plugins.add('converse-minimize', {
-
         overrides: {
             // Overrides mentioned here will be picked up by converse.js's
             // plugin architecture they will replace existing methods on the
diff --git a/src/converse-muc.js b/src/converse-muc.js
index b7da11a63..11a5ea66c 100755
--- a/src/converse-muc.js
+++ b/src/converse-muc.js
@@ -31,7 +31,6 @@
             "converse-chatview"
     ], factory);
 }(this, function (
-            _converse,
             converse,
             tpl_chatarea,
             tpl_chatroom,
diff --git a/src/converse-notification.js b/src/converse-notification.js
index 2f6cd9af9..ca3853a43 100644
--- a/src/converse-notification.js
+++ b/src/converse-notification.js
@@ -22,7 +22,6 @@
              * loaded by converse.js's plugin machinery.
              */
             var _converse = this._converse;
-
             // For translations
             var __ = _converse.__;
             var ___ = _converse.___;
diff --git a/src/converse-otr.js b/src/converse-otr.js
index 57cfcffd6..8dc8c7972 100644
--- a/src/converse-otr.js
+++ b/src/converse-otr.js
@@ -28,6 +28,7 @@
     var HAS_CSPRNG = ((!_.isUndefined(crypto)) &&
         ((_.isFunction(crypto.randomBytes)) || (_.isFunction(crypto.getRandomValues))
     ));
+
     var HAS_CRYPTO = HAS_CSPRNG && (
         (!_.isUndefined(CryptoJS)) &&
         (!_.isUndefined(otr.OTR)) &&