OTR stuff has been moved to a component/plugin in src/converse-otr.js

Also fixed errors with converse obj not being defined in the MUC plugin.

converse.js

@@ -9,6 +9,7 @@ define("converse", [
      * Any of the following components can be removed if they're not needed.
      */
     "converse-muc", // XEP-0045 Multi-user chat
+    "converse-otr", // Off-the-record encryption for one-on-one messages
     /* End: Removable components */
 
     "converse-core"

main.js

@@ -46,6 +46,7 @@ require.config({
         // Converse
         "converse-core":            "src/converse-core",
         "converse-muc":             "src/converse-muc",
+        "converse-otr":             "src/converse-otr",
         "converse-dependencies":    "src/deps-full",
         "converse-templates":       "src/templates",
 

src/converse-muc.js

@@ -6,6 +6,9 @@
 //
 /*global converse, utils, Backbone, define, window, setTimeout */
 
+/* This is a Converse.js plugin which add support for multi-user chat rooms, as
+ * specified in XEP-0045 Multi-user chat.
+ */
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD module loading
@@ -44,8 +47,6 @@
     Strophe.addNamespace('MUC_USER', Strophe.NS.MUC + "#user");
 
     converse_api.plugins.add('muc', {
-        /* This plugin adds support for XEP-0045 Multi-user chat
-         */
 
         overrides: {
             // Overrides mentioned here will be picked up by converse.js's
@@ -53,6 +54,69 @@
             // relevant objects or classes.
             //
             // New functions which don't exist yet can also be added.
+
+            Features: {
+                addClientFeatures: function () {
+                    var converse = this._super.converse;
+                    this._super.addClientFeatures.apply(this, arguments);
+                    if (converse.allow_muc) {
+                        converse.connection.disco.addFeature(Strophe.NS.MUC);
+                    }
+                }
+            },
+
+            ControlBoxView: {
+                renderContactsPanel: function () {
+                    var converse = this._super.converse;
+                    this._super.renderContactsPanel.apply(this, arguments);
+                    if (converse.allow_muc) {
+                        this.roomspanel = new converse.RoomsPanel({
+                            '$parent': this.$el.find('.controlbox-panes'),
+                            'model': new (Backbone.Model.extend({
+                                id: b64_sha1('converse.roomspanel'+converse.bare_jid), // Required by sessionStorage
+                                browserStorage: new Backbone.BrowserStorage[converse.storage](
+                                    b64_sha1('converse.roomspanel'+converse.bare_jid))
+                            }))()
+                        });
+                        this.roomspanel.render().model.fetch();
+                        if (!this.roomspanel.model.get('nick')) {
+                            this.roomspanel.model.save({
+                                nick: Strophe.getNodeFromJid(converse.bare_jid)
+                            });
+                        }
+                    }
+                },
+
+                onConnected: function () {
+                    var converse = this._super.converse;
+                    this._super.onConnected.apply(this, arguments);
+
+                    if (this.model.get('connected')) {
+                        converse.features.off('add', this.featureAdded, this);
+                        converse.features.on('add', this.featureAdded, this);
+                        // Features could have been added before the controlbox was
+                        // initialized. We're only interested in MUC
+                        var feature = converse.features.findWhere({
+                            'var': Strophe.NS.MUC
+                        });
+                        if (feature) {
+                            this.featureAdded(feature);
+                        }
+                    }
+                },
+
+                featureAdded: function (feature) {
+                    var converse = this._super.converse;
+                    if ((feature.get('var') === Strophe.NS.MUC) && (converse.allow_muc)) {
+                        this.roomspanel.model.save({muc_domain: feature.get('from')});
+                        var $server= this.$el.find('input.new-chatroom-server');
+                        if (! $server.is(':focus')) {
+                            $server.val(this.roomspanel.model.get('muc_domain'));
+                        }
+                    }
+                }
+            },
+
             ChatBoxView: {
                 clearChatRoomMessages: function (ev) {
                     /* New method added to the ChatBox model which allows all
@@ -72,7 +136,7 @@
                     /* Override so that we can register a handler
                      * for chat room invites.
                      */
-                    this._super.registerMessageHandler(); // First call the original
+                    this._super.registerMessageHandler.apply(this, arguments); // First call the original
                     this._super.converse.connection.addHandler(
                         function (message) {
                             this.onInvite(message);
@@ -134,10 +198,11 @@
             var converse = this.converse;
             // Configuration values for this plugin
             var settings = {
+                allow_muc: true,
                 auto_join_on_invite: false  // Auto-join chatroom on invite
             };
-            _.extend(this, settings);
-            _.extend(this, _.pick(converse.user_settings, Object.keys(settings)));
+            _.extend(converse, settings);
+            _.extend(converse, _.pick(converse.user_settings, Object.keys(settings)));
 
             converse.ChatRoomView = converse.ChatBoxView.extend({
                 /* Backbone View which renders a chat room, based upon the view

src/deps-full.js

@@ -3,7 +3,6 @@ define("converse-dependencies", [
     "underscore",
     "polyfill",
     "utils",
-    "otr",
     "moment_with_locales",
     "strophe",
     "strophe.disco",
@@ -14,11 +13,10 @@ define("converse-dependencies", [
     "backbone.overview",
     "jquery.browser",
     "typeahead"
-], function($, _, dummy, utils, otr, moment, Strophe) {
+], function($, _, dummy, utils, moment, Strophe) {
     return _.extend({
         'underscore': _,
         'jQuery': $,
-        'otr': otr,
         'moment': moment,
         'utils': utils
     }, Strophe);

src/templates/toolbar_otr.html

+{[ if (allow_otr)  { ]}
+    <li class="toggle-otr {{otr_status_class}}" title="{{otr_tooltip}}">
+        <span class="chat-toolbar-text">{{otr_translated_status}}</span>
+        {[ if (otr_status == UNENCRYPTED) { ]}
+            <span class="icon-unlocked"></span>
+        {[ } ]}
+        {[ if (otr_status == UNVERIFIED) { ]}
+            <span class="icon-lock"></span>
+        {[ } ]}
+        {[ if (otr_status == VERIFIED) { ]}
+            <span class="icon-lock"></span>
+        {[ } ]}
+        {[ if (otr_status == FINISHED) { ]}
+            <span class="icon-unlocked"></span>
+        {[ } ]}
+        <ul>
+            {[ if (otr_status == UNENCRYPTED) { ]}
+               <li><a class="start-otr" href="#">{{label_start_encrypted_conversation}}</a></li>
+            {[ } ]}
+            {[ if (otr_status != UNENCRYPTED) { ]}
+               <li><a class="start-otr" href="#">{{label_refresh_encrypted_conversation}}</a></li>
+               <li><a class="end-otr" href="#">{{label_end_encrypted_conversation}}</a></li>
+               <li><a class="auth-otr" data-scheme="smp" href="#">{{label_verify_with_smp}}</a></li>
+            {[ } ]}
+            {[ if (otr_status == UNVERIFIED) { ]}
+               <li><a class="auth-otr" data-scheme="fingerprint" href="#">{{label_verify_with_fingerprints}}</a></li>
+            {[ } ]}
+            <li><a href="http://www.cypherpunks.ca/otr/help/3.2.0/levels.php" target="_blank">{{label_whats_this}}</a></li>
+        </ul>
+    </li>
+{[ } ]}