Release 21.2.5

DevExpress · Jan 24, 2022 · 8aa284a · 8aa284a
1 parent 14dfb2d
commit 8aa284a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 110 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/js/ui/file_manager/file_items_controller.js b/js/ui/file_manager/file_items_controller.js
@@ -90,19 +90,20 @@ export default class FileItemsController {
             return this._updateProviderOnly(fileProvider);
         }
 
-        return this._getDirectoryByPathParts(this._rootDirectoryInfo, currentPathKeys, true).then(newDirectory => {
-            if(newDirectory !== this._rootDirectoryInfo) {
-                this._resetCurrentDirectory();
-            }
-            this._setProvider(fileProvider);
-            return this.setCurrentPathByKeys(currentPathKeys);
-        });
+        return when(this._getDirectoryByPathParts(this._rootDirectoryInfo, currentPathKeys, true))
+            .then(newDirectory => {
+                if(newDirectory !== this._rootDirectoryInfo) {
+                    this._resetCurrentDirectory();
+                }
+                this._setProvider(fileProvider);
+            })
+            .then(() => this.setCurrentPathByKeys(currentPathKeys));
     }
 
     _updateProviderOnly(fileProvider) {
         this._resetCurrentDirectory();
         this._setProvider(fileProvider);
-        return this.refresh();
+        return when(this.refresh());
     }
 
     _createFileProvider(fileProvider) {

diff --git a/js/ui/file_manager/ui.file_manager.js b/js/ui/file_manager/ui.file_manager.js
@@ -49,7 +49,7 @@ class FileManager extends Widget {
         super._init();
         this._initActions();
 
-        this._providerUpdateDeferred = new Deferred().resolve();
+        this._providerUpdateDeferred = null;
         this._lockCurrentPathProcessing = false;
 
         this._controller = new FileItemsController({
@@ -532,20 +532,24 @@ class FileManager extends Widget {
 
         switch(name) {
             case 'currentPath':
-                this._lockCurrentPathProcessing = true;
-
-                this._providerUpdateDeferred.then(() => {
-                    this._lockCurrentPathProcessing = false;
-                    return this._controller.setCurrentPath(args.value);
-                });
+                {
+                    const updateFunc = () => {
+                        this._lockCurrentPathProcessing = false;
+                        return this._controller.setCurrentPath(args.value);
+                    };
+                    this._lockCurrentPathProcessing = true;
+                    this._providerUpdateDeferred ? this._providerUpdateDeferred.then(updateFunc) : updateFunc();
+                }
                 break;
             case 'currentPathKeys':
-                this._lockCurrentPathProcessing = true;
-
-                this._providerUpdateDeferred.then(() => {
-                    this._lockCurrentPathProcessing = false;
-                    this._controller.setCurrentPathByKeys(args.value);
-                });
+                {
+                    const updateFunc = () => {
+                        this._lockCurrentPathProcessing = false;
+                        return this._controller.setCurrentPathByKeys(args.value);
+                    };
+                    this._lockCurrentPathProcessing = true;
+                    this._providerUpdateDeferred ? this._providerUpdateDeferred.then(updateFunc) : updateFunc();
+                }
                 break;
             case 'selectedItemKeys':
                 if(!this._lockSelectionProcessing && this._itemView) {
@@ -568,7 +572,10 @@ class FileManager extends Widget {
                 const pathKeys = this._lockCurrentPathProcessing ? undefined : this.option('currentPathKeys');
                 this._controller.updateProvider(args.value, pathKeys)
                     .then(() => this._providerUpdateDeferred.resolve())
-                    .then(() => this.repaint());
+                    .always(() => {
+                        this._providerUpdateDeferred = null;
+                        this.repaint();
+                    });
                 break;
             }
             case 'allowedFileExtensions':

diff --git a/themebuilder-scss/dart-compiler/.vscode/launch.json b/themebuilder-scss/dart-compiler/.vscode/launch.json