diff options
| author | Shyam Sunder | 2018-06-25 10:47:20 -0400 |
|---|---|---|
| committer | Marcin Kurczewski | 2018-06-27 21:20:03 +0200 |
| commit | 3972b902d840e54bd4f8dd47a9d13bc20ee22c65 (patch) | |
| tree | 22a2d05fdc2a89a6c6595ef2a56d0747d761dc2a /client/js/views | |
| parent | 2bf361c64a46d575533f68f8ced88e037f887335 (diff) | |
client: fetch configurations from server at runtime
Permissions, regex filters, app title, email info,
and safety now fetched using server's Info API
Diffstat (limited to 'client/js/views')
| -rw-r--r-- | client/js/views/help_view.js | 4 | ||||
| -rw-r--r-- | client/js/views/login_view.js | 12 | ||||
| -rw-r--r-- | client/js/views/not_found_view.js | 1 | ||||
| -rw-r--r-- | client/js/views/password_reset_view.js | 6 | ||||
| -rw-r--r-- | client/js/views/post_merge_view.js | 1 | ||||
| -rw-r--r-- | client/js/views/registration_view.js | 6 | ||||
| -rw-r--r-- | client/js/views/tag_edit_view.js | 4 | ||||
| -rw-r--r-- | client/js/views/tag_merge_view.js | 4 | ||||
| -rw-r--r-- | client/js/views/user_edit_view.js | 6 |
9 files changed, 21 insertions, 23 deletions
diff --git a/client/js/views/help_view.js b/client/js/views/help_view.js index 4938b23..11f6a39 100644 --- a/client/js/views/help_view.js +++ b/client/js/views/help_view.js @@ -1,6 +1,6 @@ 'use strict'; -const config = require('../config.js'); +const api = require('../api.js'); const views = require('../util/views.js'); const template = views.getTemplate('help'); @@ -26,7 +26,7 @@ class HelpView { const sourceNode = template(); const ctx = { - name: config.name, + name: api.getName(), }; section = section || 'about'; diff --git a/client/js/views/login_view.js b/client/js/views/login_view.js index 7d97982..2c05332 100644 --- a/client/js/views/login_view.js +++ b/client/js/views/login_view.js @@ -1,7 +1,7 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); +const api = require('../api.js'); const views = require('../util/views.js'); const template = views.getTemplate('login'); @@ -12,15 +12,15 @@ class LoginView extends events.EventTarget { this._hostNode = document.getElementById('content-holder'); views.replaceContent(this._hostNode, template({ - userNamePattern: config.userNameRegex, - passwordPattern: config.passwordRegex, - canSendMails: config.canSendMails, + userNamePattern: api.getUserNameRegex(), + passwordPattern: api.getPasswordRegex(), + canSendMails: api.canSendMails(), })); views.syncScrollPosition(); views.decorateValidator(this._formNode); - this._userNameInputNode.setAttribute('pattern', config.userNameRegex); - this._passwordInputNode.setAttribute('pattern', config.passwordRegex); + this._userNameInputNode.setAttribute('pattern', api.getUserNameRegex()); + this._passwordInputNode.setAttribute('pattern', api.getPasswordRegex()); this._formNode.addEventListener('submit', e => { e.preventDefault(); this.dispatchEvent(new CustomEvent('submit', { diff --git a/client/js/views/not_found_view.js b/client/js/views/not_found_view.js index 8b5a103..487613b 100644 --- a/client/js/views/not_found_view.js +++ b/client/js/views/not_found_view.js @@ -1,6 +1,5 @@ 'use strict'; -const config = require('../config.js'); const views = require('../util/views.js'); const template = views.getTemplate('not-found'); diff --git a/client/js/views/password_reset_view.js b/client/js/views/password_reset_view.js index 25409c7..685fe5a 100644 --- a/client/js/views/password_reset_view.js +++ b/client/js/views/password_reset_view.js @@ -1,7 +1,7 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); +const api = require('../api.js'); const views = require('../util/views.js'); const template = views.getTemplate('password-reset'); @@ -12,8 +12,8 @@ class PasswordResetView extends events.EventTarget { this._hostNode = document.getElementById('content-holder'); views.replaceContent(this._hostNode, template({ - canSendMails: config.canSendMails, - contactEmail: config.contactEmail, + canSendMails: api.canSendMails(), + contactEmail: api.getContactEmail(), })); views.syncScrollPosition(); diff --git a/client/js/views/post_merge_view.js b/client/js/views/post_merge_view.js index 04ed21d..3e987b3 100644 --- a/client/js/views/post_merge_view.js +++ b/client/js/views/post_merge_view.js @@ -1,6 +1,5 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); const views = require('../util/views.js'); diff --git a/client/js/views/registration_view.js b/client/js/views/registration_view.js index fb924c2..48034dd 100644 --- a/client/js/views/registration_view.js +++ b/client/js/views/registration_view.js @@ -1,7 +1,7 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); +const api = require('../api.js'); const views = require('../util/views.js'); const template = views.getTemplate('user-registration'); @@ -11,8 +11,8 @@ class RegistrationView extends events.EventTarget { super(); this._hostNode = document.getElementById('content-holder'); views.replaceContent(this._hostNode, template({ - userNamePattern: config.userNameRegex, - passwordPattern: config.passwordRegex, + userNamePattern: api.getUserNameRegex(), + passwordPattern: api.getPasswordRegex(), })); views.syncScrollPosition(); views.decorateValidator(this._formNode); diff --git a/client/js/views/tag_edit_view.js b/client/js/views/tag_edit_view.js index 77c7cef..5b517d4 100644 --- a/client/js/views/tag_edit_view.js +++ b/client/js/views/tag_edit_view.js @@ -1,7 +1,7 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); +const api = require('../api.js'); const misc = require('../util/misc.js'); const views = require('../util/views.js'); const TagInputControl = require('../controls/tag_input_control.js'); @@ -64,7 +64,7 @@ class TagEditView extends events.EventTarget { } _evtNameInput(e) { - const regex = new RegExp(config.tagNameRegex); + const regex = new RegExp(api.getTagNameRegex()); const list = misc.splitByWhitespace(this._namesFieldNode.value); if (!list.length) { diff --git a/client/js/views/tag_merge_view.js b/client/js/views/tag_merge_view.js index 1228680..c975a50 100644 --- a/client/js/views/tag_merge_view.js +++ b/client/js/views/tag_merge_view.js @@ -1,7 +1,7 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); +const api = require('../api.js'); const views = require('../util/views.js'); const TagAutoCompleteControl = require('../controls/tag_auto_complete_control.js'); @@ -14,7 +14,7 @@ class TagMergeView extends events.EventTarget { this._tag = ctx.tag; this._hostNode = ctx.hostNode; - ctx.tagNamePattern = config.tagNameRegex; + ctx.tagNamePattern = api.getTagNameRegex(); views.replaceContent(this._hostNode, template(ctx)); views.decorateValidator(this._formNode); diff --git a/client/js/views/user_edit_view.js b/client/js/views/user_edit_view.js index 28208ea..8a6f1a4 100644 --- a/client/js/views/user_edit_view.js +++ b/client/js/views/user_edit_view.js @@ -1,7 +1,7 @@ 'use strict'; -const config = require('../config.js'); const events = require('../events.js'); +const api = require('../api.js'); const views = require('../util/views.js'); const FileDropperControl = require('../controls/file_dropper_control.js'); @@ -11,8 +11,8 @@ class UserEditView extends events.EventTarget { constructor(ctx) { super(); - ctx.userNamePattern = config.userNameRegex + /|^$/.source; - ctx.passwordPattern = config.passwordRegex + /|^$/.source; + ctx.userNamePattern = api.getUserNameRegex() + /|^$/.source; + ctx.passwordPattern = api.getPasswordRegex() + /|^$/.source; this._user = ctx.user; this._hostNode = ctx.hostNode; |