Merge branch 'dev-v7' into user-group-permissions

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html

@@ -6,7 +6,8 @@
             placeholder="@general_url"
             class="umb-editor umb-textstring"
             ng-model="model.target.url"
-            ng-disabled="model.target.id"/>
+            ng-disabled="model.target.id"
+            focus-when="{{true}} "/>
     </umb-control-group>
 
     <umb-control-group label="@content_nodeName">

src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js

@@ -138,15 +138,15 @@ function fileUploadController($scope, $element, $compile, imageHelper, fileManag
         //cannot just check for !newVal because it might be an empty string which we
         //want to look for.
         if (newVal !== null && newVal !== undefined && newVal !== oldVal) {
-            //now we need to check if we need to re-initialize our structure which is kind of tricky
-            // since we only want to do that if the server has changed the value, not if this controller
-            // has changed the value. There's only 2 scenarios where we change the value internall so
-            // we know what those values can be, if they are not either of them, then we'll re-initialize.
-
-            if (newVal.clearFiles !== true && newVal !== $scope.originalValue && !newVal.selectedFiles) {
+            // here we need to check if the value change needs to trigger an update in the UI.
+            // if the value is only changed in the controller and not in the server values, we do not
+            // want to trigger an update yet.
+            // we can however no longer rely on checking values in the controller vs. values from the server
+            // to determine whether to update or not, since you could potentially be uploading a file with
+            // the exact same name - in that case we need to reinitialize to show the newly uploaded file.
+            if (newVal.clearFiles !== true && !newVal.selectedFiles) {
                 initialize($scope.rebuildInput.index + 1);
             }
-
         }
     });
 };