-
-
Notifications
You must be signed in to change notification settings - Fork 801
feat(toolbar): Insert Current Location button (addresses #1559) #3893
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
6a1646e
12f3d2b
38584f9
0e85b40
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import { __ } from 'i18n'; | |
| import { routeToForm } from './utils.js'; | ||
| import RegistrationForm from './form.js'; | ||
| import RegisterLink from './register_link.js'; | ||
| import 'shared/autocomplete/index.js'; | ||
|
|
||
| // Strophe methods for building stanzas | ||
| const { Strophe } = converse.env; | ||
|
|
@@ -43,7 +44,10 @@ converse.plugins.add('converse-register', { | |
| allow_registration: true, | ||
| domain_placeholder: __(' e.g. conversejs.org'), // Placeholder text shown in the domain input on the registration form | ||
| providers_link: 'https://providers.xmpp.net/', // Link to XMPP providers shown on registration page | ||
| registration_domain: '' | ||
| registration_domain: '', | ||
| // Optional list of known public XMPP providers to suggest during registration | ||
| // e.g.: ['conversejs.org', 'jabber.org', 'xmpp.jp'] | ||
| registration_providers: [] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This also looks unrelated to this PR. |
||
| }); | ||
|
|
||
| const exports = { RegisterLink, RegistrationForm }; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,15 +37,16 @@ function tplDomainInput(el) { | |
| const i18n_providers = __('Tip: A list of public XMPP providers is available'); | ||
| const i18n_providers_link = __('here'); | ||
| const href_providers = api.settings.get('providers_link'); | ||
| const providers = api.settings.get('registration_providers') || []; | ||
| return html` | ||
| <input | ||
| class="form-control" | ||
| required="required" | ||
| type="text" | ||
| <converse-autocomplete | ||
| .list=${providers} | ||
| filter="startswith" | ||
| name="domain" | ||
| placeholder="${domain_placeholder}" | ||
| value="${el.domain}" | ||
| /> | ||
| ?required=${true} | ||
| .value=${el.domain || ''} | ||
| ></converse-autocomplete> | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here. @Bennethxyz Please remove any commits and changes unrelated to this PR which is about sending your location. Thanks. |
||
| <p class="form-text text-muted"> | ||
| ${i18n_providers} | ||
| <a href="${href_providers}" class="url" target="_blank" rel="noopener">${i18n_providers_link}</a>. | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Bennethxyz This looks unrelated to this PR, right?