diff --git a/docs/source/plugin_development.rst b/docs/source/plugin_development.rst index 1930e9709..d759a7af5 100644 --- a/docs/source/plugin_development.rst +++ b/docs/source/plugin_development.rst @@ -134,7 +134,7 @@ An example plugin sendPresence: function (type, status_message, jid) { // The "_converse" object is available via the __super__ // attribute. - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; // Custom code can come here // ... diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js index 3b98a99be..0ec456ba4 100644 --- a/src/converse-bookmarks.js +++ b/src/converse-bookmarks.js @@ -186,7 +186,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; // Configuration values for this plugin // ==================================== // Refer to docs/source/configuration.rst for explanations of these diff --git a/src/converse-controlbox.js b/src/converse-controlbox.js index 4927829fa..70c47eea3 100644 --- a/src/converse-controlbox.js +++ b/src/converse-controlbox.js @@ -201,7 +201,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; this.updateSettings({ allow_logout: true, default_domain: undefined, diff --git a/src/converse-core.js b/src/converse-core.js index 6c5311339..d4a3d1083 100755 --- a/src/converse-core.js +++ b/src/converse-core.js @@ -49,7 +49,7 @@ _converse.emit = _converse.trigger; // Make converse pluggable - pluggable.enable(_converse, 'converse', 'pluggable'); + pluggable.enable(_converse, '_converse', 'pluggable'); // Module-level constants _converse.STATUS_WEIGHTS = { @@ -1974,8 +1974,7 @@ _converse.pluggable.initializePlugins({ 'updateSettings': updateSettings, - // TODO: rename - 'converse': _converse + '_converse': _converse }); _converse.emit('pluginsInitialized'); _converse._initialize(); diff --git a/src/converse-dragresize.js b/src/converse-dragresize.js index 480dc5dfe..b0dd13ba1 100644 --- a/src/converse-dragresize.js +++ b/src/converse-dragresize.js @@ -301,7 +301,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; this.updateSettings({ allow_dragresize: true, }); diff --git a/src/converse-muc.js b/src/converse-muc.js index e553e5614..8c32bb8d9 100755 --- a/src/converse-muc.js +++ b/src/converse-muc.js @@ -132,7 +132,7 @@ ControlBoxView: { renderContactsPanel: function () { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; this.__super__.renderContactsPanel.apply(this, arguments); if (_converse.allow_muc) { this.roomspanel = new _converse.RoomsPanel({ @@ -153,7 +153,7 @@ }, onConnected: function () { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; this.__super__.onConnected.apply(this, arguments); if (!this.model.get('connected')) { return; @@ -183,7 +183,7 @@ }, featureAdded: function (feature) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; if ((feature.get('var') === Strophe.NS.MUC) && (_converse.allow_muc)) { this.setMUCDomain(feature.get('from')); } diff --git a/src/converse-notification.js b/src/converse-notification.js index 5a5d4dc1e..a0beae235 100644 --- a/src/converse-notification.js +++ b/src/converse-notification.js @@ -25,7 +25,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; _converse.supports_html5_notification = "Notification" in window; this.updateSettings({ diff --git a/src/converse-otr.js b/src/converse-otr.js index e64ecb0d1..9a4900ae5 100644 --- a/src/converse-otr.js +++ b/src/converse-otr.js @@ -108,7 +108,7 @@ }, createMessage: function (message, delay, original_stanza) { - var _converse = this.__super__.converse, + var _converse = this.__super__._converse, text = _.propertyOf(message.querySelector('body'))('textContent'); if ((!text) || (!_converse.allow_otr)) { @@ -135,7 +135,7 @@ }, getSession: function (callback) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; var cipher = CryptoJS.lib.PasswordBasedCipher; var pass, instance_tag, saved_key, pass_check; if (_converse.cache_otr_key) { @@ -226,7 +226,7 @@ // send the query message to them. this.save({'otr_status': UNENCRYPTED}); this.getSession(function (session) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; this.otr = new otr.OTR({ fragment_size: 140, send_interval: 200, @@ -273,7 +273,7 @@ }, initialize: function () { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; this.__super__.initialize.apply(this, arguments); this.model.on('change:otr_status', this.onOTRStatusChanged, this); this.model.on('showOTRError', this.showOTRError, this); @@ -301,7 +301,7 @@ }, onMessageSubmitted: function (text) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; if (!_converse.connection.authenticated) { return this.showHelpMessages( ['Sorry, the connection has been lost, '+ @@ -346,7 +346,7 @@ }, showOTRError: function (msg) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; if (msg === 'Message cannot be sent at this time.') { this.showHelpMessages( [__('Your message could not be sent')], 'error'); @@ -378,7 +378,7 @@ }, authOTR: function (ev) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; var scheme = $(ev.target).data().scheme; var result, question, answer; if (scheme === 'fingerprint') { @@ -425,7 +425,7 @@ }, renderToolbar: function (toolbar, options) { - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; if (!_converse.show_toolbar) { return; } @@ -461,7 +461,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; // Translation aware constants // --------------------------- // We can only call the __ translation method *after* converse.js diff --git a/src/converse-ping.js b/src/converse-ping.js index de60af930..38fd78402 100644 --- a/src/converse-ping.js +++ b/src/converse-ping.js @@ -26,7 +26,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; this.updateSettings({ ping_interval: 180 //in seconds diff --git a/src/converse-register.js b/src/converse-register.js index e79ff730a..3efc0a814 100644 --- a/src/converse-register.js +++ b/src/converse-register.js @@ -75,7 +75,7 @@ * login panel. */ this.__super__.renderLoginPanel.apply(this, arguments); - var _converse = this.__super__.converse; + var _converse = this.__super__._converse; if (_converse.allow_registration) { this.registerpanel = new _converse.RegisterPanel({ '$parent': this.$el.find('.controlbox-panes'), @@ -92,7 +92,7 @@ /* The initialize function gets called as soon as the plugin is * loaded by converse.js's plugin machinery. */ - var _converse = this.converse; + var _converse = this._converse; this.updateSettings({ allow_registration: true,