Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Rename login and register urls

Browse Source
This commit is contained in:
JC Brand 2017-10-31 20:39:44 +01:00
parent ad0e457486
commit 61ed55dbaa
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/converse-muc.js
View File

@ -839,7 +839,11 @@
affiliations = [affiliations]; affiliations = [affiliations];
} }
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const promises = _.map(affiliations, _.partial(this.requestMemberList, this.model.get('jid'))); const promises = _.map(
affiliations,
_.partial(this.requestMemberList, this.model.get('jid'))
);
Promise.all(promises).then( Promise.all(promises).then(
_.flow(this.marshallAffiliationIQs.bind(this), resolve), _.flow(this.marshallAffiliationIQs.bind(this), resolve),
_.flow(this.marshallAffiliationIQs.bind(this), resolve) _.flow(this.marshallAffiliationIQs.bind(this), resolve)

4
src/converse-register.js
View File

@ -147,8 +147,8 @@
const RegistrationRouter = Backbone.Router.extend({ const RegistrationRouter = Backbone.Router.extend({
initialize () { initialize () {
this.route('converse-login', _.partial(this.setActiveForm, 'login')); this.route('converse/login', _.partial(this.setActiveForm, 'login'));
this.route('converse-register', _.partial(this.setActiveForm, 'register')); this.route('converse/register', _.partial(this.setActiveForm, 'register'));
}, },
setActiveForm (value) { setActiveForm (value) {
_converse.api.waitUntil('controlboxInitialized').then(() => { _converse.api.waitUntil('controlboxInitialized').then(() => {

2
src/templates/register_link.html
View File

@ -1,4 +1,4 @@
<div class="switch-form"> <div class="switch-form">
<p>{{{ __("Don't have a chat account?") }}}</p> <p>{{{ __("Don't have a chat account?") }}}</p>
<p><a class="register-account toggle-register-login" href="#converse-register">{{{__("Create an account")}}}</a></p> <p><a class="register-account toggle-register-login" href="#converse/register">{{{__("Create an account")}}}</a></p>
</div> </div>

2
src/templates/register_panel.html
View File

@ -17,6 +17,6 @@
<div class="switch-form"> <div class="switch-form">
<p>{{{ __("Already have a chat account?") }}}</p> <p>{{{ __("Already have a chat account?") }}}</p>
<p> <p>
<a class="login-here toggle-register-login" href="#converse-login">{{{__("Log in here")}}}</a> <a class="login-here toggle-register-login" href="#converse/login">{{{__("Log in here")}}}</a>
</p> </p>
</div> </div>