From 813741bc3dcfd62493b5f20332f6abe4baf88f53 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Thu, 16 Feb 2017 18:41:32 +0100 Subject: [PATCH 1/3] Added property for hiding the target option (1/2) --- .../views/common/overlays/linkpicker/linkpicker.controller.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js index 5d638444c7..59e27db163 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js @@ -22,6 +22,8 @@ angular.module("umbraco").controller("Umbraco.Overlays.LinkPickerController", selectedSearchResults: [] }; + $scope.showTarget = $scope.model.hideTarget !== true; + if (dialogOptions.currentTarget) { $scope.model.target = dialogOptions.currentTarget; From 64f477f90ebac8b12893a861926a139e584f1d10 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Thu, 16 Feb 2017 18:45:01 +0100 Subject: [PATCH 2/3] Added property for hiding the target option (2/2) --- .../src/views/common/overlays/linkpicker/linkpicker.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html index e063b7bab3..b99bc6c023 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html @@ -17,7 +17,7 @@ ng-model="model.target.name" /> - + From 98837577047b8ce087f89a162acda3aeea2b9d69 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 4 Jan 2018 15:34:22 +0100 Subject: [PATCH 3/3] U4-10739 - cosmetics --- src/Umbraco.Core/IO/PhysicalFileSystem.cs | 27 +++++++++-------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs index df72164b20..6cd709f2d3 100644 --- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs +++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs @@ -424,31 +424,26 @@ namespace Umbraco.Core.IO const int count = 10; const int pausems = 100; - for (var i = 0;i < count; i++) + for (var i = 0;; i++) { try { - action(); - // don't retry if the action succeeded - i = count; + action(); + break; // done } catch (IOException e) - { - // if it's not *exactly* IOException then it could be - // some inherited exception such as FileNotFoundException, + { + // if it's not *exactly* IOException then it could be + // some inherited exception such as FileNotFoundException, // and then we don't want to retry if (e.GetType() != typeof(IOException)) throw; - - // wait and retry - if (i < count-1) - { - Thread.Sleep(pausems); - continue; - } - // throw if out of retries - throw; + // if we have tried enough, throw, else swallow + // the exception and retry after a pause + if (i == count) throw; } + + Thread.Sleep(pausems); } }