diff options
| author | Ruin0x11 | 2020-06-02 17:43:18 -0700 |
|---|---|---|
| committer | Ruin0x11 | 2020-06-02 17:43:18 -0700 |
| commit | 1be947e9462edf3bb0a8d15172e0c6e0190e0482 (patch) | |
| tree | 388fc2561df9f0235d3a8be15fd597a7d650dbb7 /client | |
| parent | 7bcefeb347cb2969142fbab49a06ac2055be5c02 (diff) | |
PR fixes
Diffstat (limited to 'client')
| -rw-r--r-- | client/html/pool_input.tpl | 1 | ||||
| -rw-r--r-- | client/html/pool_summary.tpl | 12 | ||||
| -rw-r--r-- | client/js/controllers/pool_controller.js | 11 | ||||
| -rw-r--r-- | client/js/controllers/pool_create_controller.js | 3 | ||||
| -rw-r--r-- | client/js/controls/pool_input_control.js | 160 | ||||
| -rw-r--r-- | client/js/models/pool_category.js | 2 |
6 files changed, 92 insertions, 97 deletions
diff --git a/client/html/pool_input.tpl b/client/html/pool_input.tpl index 0c2a3fd..483e790 100644 --- a/client/html/pool_input.tpl +++ b/client/html/pool_input.tpl @@ -1,7 +1,6 @@ <div class='pool-input'> <div class='main-control'> <input type='text' placeholder='type to add…'/> - <!-- <button>Add</button> --> </div> <ul class='compact-pools'></ul> diff --git a/client/html/pool_summary.tpl b/client/html/pool_summary.tpl index 8f4e27d..2b70d27 100644 --- a/client/html/pool_summary.tpl +++ b/client/html/pool_summary.tpl @@ -6,12 +6,12 @@ </section> <section> - Aliases:<br/> - <ul><!-- - --><% for (let name of ctx.pool.names.slice(1)) { %><!-- - --><li><%= ctx.makePoolLink(ctx.pool.id, false, false, ctx.pool, name) %></li><!-- - --><% } %><!-- - --></ul> + Aliases:<br/> + <ul> + <% for (let name of ctx.pool.names.slice(1)) { %> + <li><%= ctx.makePoolLink(ctx.pool.id, false, false, ctx.pool, name) %></li> + <% } %> + </ul> </section> </section> diff --git a/client/js/controllers/pool_controller.js b/client/js/controllers/pool_controller.js index e243cd8..22920f0 100644 --- a/client/js/controllers/pool_controller.js +++ b/client/js/controllers/pool_controller.js @@ -54,8 +54,7 @@ class PoolController { this._view.addEventListener('submit', e => this._evtUpdate(e)); this._view.addEventListener('merge', e => this._evtMerge(e)); this._view.addEventListener('delete', e => this._evtDelete(e)); - }, - error => { + }, error => { this._view = new EmptyView(); this._view.showError(error.message); }); @@ -68,9 +67,7 @@ class PoolController { _evtSaved(e, section) { misc.disableExitConfirmation(); if (this._name !== e.detail.pool.names[0]) { - router.replace( - uri.formatClientLink('pool', e.detail.pool.id, section), - null, false); + router.replace(uri.formatClientLink('pool', e.detail.pool.id, section), null, false); } } @@ -87,9 +84,9 @@ class PoolController { e.detail.pool.description = e.detail.description; } if (e.detail.posts !== undefined) { - e.detail.pool.posts.clear() + e.detail.pool.posts.clear(); for (let post_id of e.detail.posts) { - e.detail.pool.posts.add(Post.fromResponse({ id: parseInt(post_id) })) + e.detail.pool.posts.add(Post.fromResponse({ id: parseInt(post_id) })); } } e.detail.pool.save().then(() => { diff --git a/client/js/controllers/pool_create_controller.js b/client/js/controllers/pool_create_controller.js index ef6dded..0684693 100644 --- a/client/js/controllers/pool_create_controller.js +++ b/client/js/controllers/pool_create_controller.js @@ -16,8 +16,7 @@ class PoolCreateController { return; } - PoolCategoryList.get() - .then(poolCategoriesResponse => { + PoolCategoryList.get().then(poolCategoriesResponse => { const categories = {}; for (let category of poolCategoriesResponse.results) { categories[category.name] = category.name; diff --git a/client/js/controls/pool_input_control.js b/client/js/controls/pool_input_control.js index a827206..95dfc5c 100644 --- a/client/js/controls/pool_input_control.js +++ b/client/js/controls/pool_input_control.js @@ -81,105 +81,105 @@ class PoolInputControl extends events.EventTarget { return Promise.resolve(); } - this.pools.add(pool, false) + this.pools.add(pool, false) - const listItemNode = this._createListItemNode(pool); - if (!pool.category) { - listItemNode.classList.add('new'); - } - this._poolListNode.prependChild(listItemNode); - _fadeOutListItemNodeStatus(listItemNode); + const listItemNode = this._createListItemNode(pool); + if (!pool.category) { + listItemNode.classList.add('new'); + } + this._poolListNode.prependChild(listItemNode); + _fadeOutListItemNodeStatus(listItemNode); - this.dispatchEvent(new CustomEvent('add', { - detail: {pool: pool, source: source}, - })); - this.dispatchEvent(new CustomEvent('change')); + this.dispatchEvent(new CustomEvent('add', { + detail: {pool: pool, source: source}, + })); + this.dispatchEvent(new CustomEvent('change')); - return Promise.resolve(); + return Promise.resolve(); } - deletePool(pool) { - if (!this.pools.hasPoolId(pool.id)) { - return; - } - this.pools.removeById(pool.id); - this._hideAutoComplete(); + deletePool(pool) { + if (!this.pools.hasPoolId(pool.id)) { + return; + } + this.pools.removeById(pool.id); + this._hideAutoComplete(); - this._deleteListItemNode(pool); + this._deleteListItemNode(pool); - this.dispatchEvent(new CustomEvent('remove', { - detail: {pool: pool}, - })); - this.dispatchEvent(new CustomEvent('change')); - } + this.dispatchEvent(new CustomEvent('remove', { + detail: {pool: pool}, + })); + this.dispatchEvent(new CustomEvent('change')); + } - _createListItemNode(pool) { - const className = pool.category ? - misc.makeCssName(pool.category, 'pool') : - null; + _createListItemNode(pool) { + const className = pool.category ? + misc.makeCssName(pool.category, 'pool') : + null; - const poolLinkNode = document.createElement('a'); - if (className) { - poolLinkNode.classList.add(className); - } - poolLinkNode.setAttribute( - 'href', uri.formatClientLink('pool', pool.names[0])); + const poolLinkNode = document.createElement('a'); + if (className) { + poolLinkNode.classList.add(className); + } + poolLinkNode.setAttribute( + 'href', uri.formatClientLink('pool', pool.names[0])); - const poolIconNode = document.createElement('i'); - poolIconNode.classList.add('fa'); - poolIconNode.classList.add('fa-pool'); - poolLinkNode.appendChild(poolIconNode); + const poolIconNode = document.createElement('i'); + poolIconNode.classList.add('fa'); + poolIconNode.classList.add('fa-pool'); + poolLinkNode.appendChild(poolIconNode); - const searchLinkNode = document.createElement('a'); - if (className) { - searchLinkNode.classList.add(className); - } - searchLinkNode.setAttribute( - 'href', uri.formatClientLink( - 'posts', {query: "pool:" + pool.id})); - searchLinkNode.textContent = pool.names[0] + ' '; + const searchLinkNode = document.createElement('a'); + if (className) { + searchLinkNode.classList.add(className); + } + searchLinkNode.setAttribute( + 'href', uri.formatClientLink( + 'posts', {query: "pool:" + pool.id})); + searchLinkNode.textContent = pool.names[0] + ' '; - const usagesNode = document.createElement('span'); - usagesNode.classList.add('pool-usages'); - usagesNode.setAttribute('data-pseudo-content', pool.postCount); + const usagesNode = document.createElement('span'); + usagesNode.classList.add('pool-usages'); + usagesNode.setAttribute('data-pseudo-content', pool.postCount); - const removalLinkNode = document.createElement('a'); - removalLinkNode.classList.add('remove-pool'); - removalLinkNode.setAttribute('href', ''); - removalLinkNode.setAttribute('data-pseudo-content', '×'); - removalLinkNode.addEventListener('click', e => { - e.preventDefault(); - this.deletePool(pool); - }); + const removalLinkNode = document.createElement('a'); + removalLinkNode.classList.add('remove-pool'); + removalLinkNode.setAttribute('href', ''); + removalLinkNode.setAttribute('data-pseudo-content', '×'); + removalLinkNode.addEventListener('click', e => { + e.preventDefault(); + this.deletePool(pool); + }); - const listItemNode = document.createElement('li'); - listItemNode.appendChild(removalLinkNode); - listItemNode.appendChild(poolLinkNode); - listItemNode.appendChild(searchLinkNode); - listItemNode.appendChild(usagesNode); - for (let name of pool.names) { - this._poolToListItemNode.set(name, listItemNode); + const listItemNode = document.createElement('li'); + listItemNode.appendChild(removalLinkNode); + listItemNode.appendChild(poolLinkNode); + listItemNode.appendChild(searchLinkNode); + listItemNode.appendChild(usagesNode); + for (let name of pool.names) { + this._poolToListItemNode.set(name, listItemNode); + } + return listItemNode; } - return listItemNode; - } - _deleteListItemNode(pool) { - const listItemNode = this._getListItemNode(pool); - if (listItemNode) { - listItemNode.parentNode.removeChild(listItemNode); - } - for (let name of pool.names) { - this._poolToListItemNode.delete(name); + _deleteListItemNode(pool) { + const listItemNode = this._getListItemNode(pool); + if (listItemNode) { + listItemNode.parentNode.removeChild(listItemNode); + } + for (let name of pool.names) { + this._poolToListItemNode.delete(name); + } } - } - _getListItemNode(pool) { - return this._poolToListItemNode.get(pool.names[0]); - } + _getListItemNode(pool) { + return this._poolToListItemNode.get(pool.names[0]); + } - _hideAutoComplete() { - this._autoCompleteControl.hide(); - } + _hideAutoComplete() { + this._autoCompleteControl.hide(); + } } module.exports = PoolInputControl; diff --git a/client/js/models/pool_category.js b/client/js/models/pool_category.js index 4cdb68e..a77302c 100644 --- a/client/js/models/pool_category.js +++ b/client/js/models/pool_category.js @@ -17,7 +17,7 @@ class PoolCategory extends events.EventTarget { get name() { return this._name; } get color() { return this._color; } - get poolCount() { return this._poolCount; } + get poolCount() { return this._poolCount; } get isDefault() { return this._isDefault; } get isTransient() { return !this._origName; } |