From bd9dc3dfe3b9a071291535d387dca251e7a690f5 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 5 Aug 2022 12:37:39 +0300 Subject: [PATCH] ref --- client/src/controller.js | 20 ++++++++++---------- client/src/controllers/record.js | 24 +++++++----------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/client/src/controller.js b/client/src/controller.js index 067cd1d7ff..ea252e53ab 100644 --- a/client/src/controller.js +++ b/client/src/controller.js @@ -140,7 +140,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:models/settings.Class} + * @returns {module:models/settings.Class} */ getConfig: function () { return this._settings; @@ -148,7 +148,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:models/user.Class} + * @returns {module:models/user.Class} */ getUser: function () { return this._user; @@ -156,7 +156,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:models/preferences.Class} + * @returns {module:models/preferences.Class} */ getPreferences: function () { return this._preferences; @@ -164,7 +164,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:acl.Class} + * @returns {module:acl.Class} */ getAcl: function () { return this._acl; @@ -172,7 +172,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:cache.Class} + * @returns {module:cache.Class} */ getCache: function () { return this._cache; @@ -180,7 +180,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:router.Class} + * @returns {module:router.Class} */ getRouter: function () { return this._router; @@ -188,7 +188,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:storage.Class} + * @returns {module:storage.Class} */ getStorage: function () { return this._storage; @@ -196,7 +196,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:metadata.Class} + * @returns {module:metadata.Class} */ getMetadata: function () { return this._metadata; @@ -204,7 +204,7 @@ define('controller', [], function () { /** * @protected - * @returns {modules:date-time.Class} + * @returns {module:date-time.Class} */ getDateTime: function () { return this._dateTime; @@ -449,7 +449,7 @@ define('controller', [], function () { * @param {Object} options Options for view. * @param {module:controller.Class~viewCallback} [callback] A callback with a created view. * @param {boolean} [useStored] Use a stored view if available. - * @param {boolean} [storedKey] A stored view key. + * @param {string} [storedKey] A stored view key. */ main: function (view, options, callback, useStored, storedKey) { let isCanceled = false; diff --git a/client/src/controllers/record.js b/client/src/controllers/record.js index 04d9f8e45d..f7c883ece8 100644 --- a/client/src/controllers/record.js +++ b/client/src/controllers/record.js @@ -98,26 +98,16 @@ define('controllers/record', ['controller'], function (Dep) { }, actionList: function (options) { - var isReturn = options.isReturn; + let isReturn = options.isReturn || this.getRouter().backProcessed; - if (this.getRouter().backProcessed) { - isReturn = true; + let key = this.name + 'List'; + + if (!isReturn && this.getStoredMainView(key)) { + this.clearStoredMainView(key); } - var key = this.name + 'List'; - - if (!isReturn) { - var stored = this.getStoredMainView(key); - - if (stored) { - this.clearStoredMainView(key); - } - } - - this.getCollection(function (collection) { - this.listenToOnce(this.baseController, 'action', () => { - collection.abortLastFetch(); - }); + this.getCollection(collection => { + this.listenToOnce(this.baseController, 'action', () => collection.abortLastFetch()); this.main(this.getViewName('list'), { scope: this.name,