Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0

src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js

@@ -5,6 +5,7 @@ angular.module("umbraco")
 
             var dialogOptions = $scope.model;
 
+            $scope.disableFolderSelect = dialogOptions.disableFolderSelect;
             $scope.onlyImages = dialogOptions.onlyImages;
             $scope.showDetails = dialogOptions.showDetails;
             $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
@@ -127,11 +128,13 @@ angular.module("umbraco")
             };
 
             $scope.clickHandler = function(image, event, index) {
-
                 if (image.isFolder) {
-
-                    eventsService.emit("dialogs.mediaPicker.select", image);
-                    selectImage(image);
+                    if ($scope.disableFolderSelect) {
+                        $scope.gotoFolder(image);
+                    } else {
+                        eventsService.emit("dialogs.mediaPicker.select", image);
+                        selectImage(image);
+                    }
 
                 } else {
 

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

@@ -13,6 +13,7 @@ function MarkdownEditorController($scope, assetsService, dialogService, $timeout
       $scope.mediaPickerOverlay = {};
       $scope.mediaPickerOverlay.view = "mediaPicker";
       $scope.mediaPickerOverlay.show = true;
+      $scope.mediaPickerOverlay.disableFolderSelect = true;
 
       $scope.mediaPickerOverlay.submit = function(model) {
 

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

@@ -249,6 +249,7 @@ angular.module("umbraco")
                             currentTarget: currentTarget,
                             onlyImages: true,
                             showDetails: true,
+                            disableFolderSelect: true,
                             startNodeId: userData.startMediaId,
                             view: "mediapicker",
                             show: true,