From ed5effd19043711e28cdd18e3e88fa42db2a9722 Mon Sep 17 00:00:00 2001 From: Steve Megson Date: Thu, 8 Aug 2019 14:17:32 +0100 Subject: [PATCH 1/2] Sorting of images in multiple media picker --- .../views/propertyeditors/mediapicker/mediapicker.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js index f7e88bef36..120407ab10 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js @@ -229,7 +229,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl $scope.sortableOptions = { - disabled: !$scope.isMultiPicker, + disabled: !multiPicker, items: "li:not(.add-wrapper)", cancel: ".unsortable", update: function (e, ui) { From 296d7964ae894956d338d90218904e5f9a30c157 Mon Sep 17 00:00:00 2001 From: amitch17 Date: Wed, 7 Aug 2019 21:34:48 +0100 Subject: [PATCH 2/2] Corrected comments to change usage examples Corrected usage examples for entityResource.js My first Umbraco commit! yay! --- .../src/common/resources/entity.resource.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js index a910629f4a..7852180dfa 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js @@ -133,7 +133,7 @@ function entityResource($q, $http, umbRequestHelper) { * ##usage *
          * //get media by id
-         * entityResource.getEntityById(0, "Media")
+         * entityResource.getById(0, "Media")
          *    .then(function(ent) {
          *        var myDoc = ent;
          *        alert('its here!');
@@ -204,7 +204,7 @@ function entityResource($q, $http, umbRequestHelper) {
          * ##usage
          * 
          * //Get templates for ids
-         * entityResource.getEntitiesByIds( [1234,2526,28262], "Template")
+         * entityResource.getByIds( [1234,2526,28262], "Template")
          *    .then(function(templateArray) {
          *        var myDoc = contentArray;
          *        alert('they are here!');