From 0376c5ff49f063958c4ae46c3959fa9cc3e0ce44 Mon Sep 17 00:00:00 2001 From: Martin Polehla Date: Thu, 28 Sep 2023 04:27:54 +0300 Subject: [PATCH] Updated according to some PR comments. --- gui/default/fancyTreeGlobalDataWorker.js | 2 +- gui/default/syncthing/core/syncthingController.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/default/fancyTreeGlobalDataWorker.js b/gui/default/fancyTreeGlobalDataWorker.js index 8fa6ab2732a..04f0095b1f7 100644 --- a/gui/default/fancyTreeGlobalDataWorker.js +++ b/gui/default/fancyTreeGlobalDataWorker.js @@ -41,7 +41,7 @@ function formatGlobalTreeNodes(data, parentKey, reqId, parentIgnored = true) { var result = []; // console.log("formatGlobalTreeNodes(worker)", "data", data, "parentKey", parentKey, "parentIgnored", parentIgnored) - data.forEach((node) => { + data.forEach(function(node) { const isFolder = node.type == "FILE_INFO_TYPE_DIRECTORY"; const key = parentKey + "/" + node.name; const found = ignores.find(function (ignoreKey) { diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js index f76247da3ae..6c52527ed98 100755 --- a/gui/default/syncthing/core/syncthingController.js +++ b/gui/default/syncthing/core/syncthingController.js @@ -2327,7 +2327,7 @@ angular.module('syncthing.core') // console.log("formatGlobalTreeNodes", "data", data, "ignores", ignores); if (ignores[0] !== generatedByTreeSelector) { ignores = []; - setIgnoresText([generatedByTreeSelector, "**"]); + setIgnoresText([generatedByTreeSelector, "*"]); } else { ignores = ignores.slice(1, -1) } @@ -2377,7 +2377,7 @@ angular.module('syncthing.core') select: function (event, data) { console.log("initFolderGlobalTree | fancyTree select"); const rootNode = $scope.folderGlobalTree.getRootNode(); - const generatedIgnorePatterns = ["**"]; + const generatedIgnorePatterns = ["*"]; $.each(rootNode.getSelectedNodes(), function (_, node) { if (node.parent == rootNode || !node.parent.selected) generatedIgnorePatterns.unshift("!" + node.key); @@ -2415,7 +2415,7 @@ angular.module('syncthing.core') fancyTreeGlobalDataWorker.onmessage = function (msg) { console.log("fancyTreeGlobalDataWorker.onmessage", msg.data); if (msg.data.invalidPatterns) - setIgnoresText([generatedByTreeSelector, "**"]); + setIgnoresText([generatedByTreeSelector, "*"]); setFolderGlobalTreeFancyData(msg.data.data); } console.log('initFancyTreeGlobalDataWorker | worker ready', !!$scope.fancyTreeGlobalDataWorker);