|
@@ -59,7 +59,7 @@
|
|
|
// relevant objects or classes.
|
|
|
//
|
|
|
// New functions which don't exist yet can also be added.
|
|
|
-
|
|
|
+
|
|
|
LoginPanel: {
|
|
|
|
|
|
render: function (cfg) {
|
|
@@ -145,19 +145,15 @@
|
|
|
providers_link: 'https://xmpp.net/directory.php', // Link to XMPP providers shown on registration page
|
|
|
});
|
|
|
|
|
|
- const RegistrationRouter = Backbone.Router.extend({
|
|
|
- initialize () {
|
|
|
- this.route('converse/login', _.partial(this.setActiveForm, 'login'));
|
|
|
- this.route('converse/register', _.partial(this.setActiveForm, 'register'));
|
|
|
- },
|
|
|
- setActiveForm (value) {
|
|
|
- _converse.api.waitUntil('controlboxInitialized').then(() => {
|
|
|
- const controlbox = _converse.chatboxes.get('controlbox')
|
|
|
- controlbox.set({'active-form': value});
|
|
|
- }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
|
|
|
- }
|
|
|
- });
|
|
|
- const router = new RegistrationRouter();
|
|
|
+
|
|
|
+ function setActiveForm (value) {
|
|
|
+ _converse.api.waitUntil('controlboxInitialized').then(() => {
|
|
|
+ const controlbox = _converse.chatboxes.get('controlbox')
|
|
|
+ controlbox.set({'active-form': value});
|
|
|
+ }).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
|
|
|
+ }
|
|
|
+ _converse.router.route('converse/login', _.partial(setActiveForm, 'login'));
|
|
|
+ _converse.router.route('converse/register', _.partial(setActiveForm, 'register'));
|
|
|
|
|
|
|
|
|
_converse.RegisterPanel = Backbone.View.extend({
|
|
@@ -419,11 +415,14 @@
|
|
|
);
|
|
|
this.abortRegistration();
|
|
|
} else if (status_code === Strophe.Status.REGISTERED) {
|
|
|
- router.navigate(); // Strip the URL fragment
|
|
|
_converse.log("Registered successfully.");
|
|
|
_converse.connection.reset();
|
|
|
this.showSpinner();
|
|
|
|
|
|
+ if (_.includes(["converse/login", "converse/register"], Backbone.History.getFragment())) {
|
|
|
+ _converse.router.navigate('', {'replace': true});
|
|
|
+ }
|
|
|
+
|
|
|
if (this.fields.password && this.fields.username) {
|
|
|
// automatically log the user in
|
|
|
_converse.connection.connect(
|
|
@@ -458,7 +457,7 @@
|
|
|
form.insertAdjacentHTML(
|
|
|
'beforeend',
|
|
|
tpl_form_input({
|
|
|
- 'label': key,
|
|
|
+ 'label': key,
|
|
|
'name': key,
|
|
|
'placeholder': key,
|
|
|
'required': true,
|