yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shannon
2019-08-09 15:54:38 +10:00
parent 8a3b2e038c 296d7964ae
commit 84554101f2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
View File

@@ -133,7 +133,7 @@ function entityResource($q, $http, umbRequestHelper) {
* ##usage * ##usage
* <pre> * <pre>
* //get media by id * //get media by id
* entityResource.getEntityById(0, "Media") * entityResource.getById(0, "Media")
* .then(function(ent) { * .then(function(ent) {
* var myDoc = ent; * var myDoc = ent;
* alert('its here!'); * alert('its here!');
@@ -204,7 +204,7 @@ function entityResource($q, $http, umbRequestHelper) {
* ##usage * ##usage
* <pre> * <pre>
* //Get templates for ids * //Get templates for ids
* entityResource.getEntitiesByIds( [1234,2526,28262], "Template") * entityResource.getByIds( [1234,2526,28262], "Template")
* .then(function(templateArray) { * .then(function(templateArray) {
* var myDoc = contentArray; * var myDoc = contentArray;
* alert('they are here!'); * alert('they are here!');

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
View File

@@ -229,7 +229,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
$scope.sortableOptions = { $scope.sortableOptions = {
disabled: !$scope.isMultiPicker, disabled: !multiPicker,
items: "li:not(.add-wrapper)", items: "li:not(.add-wrapper)",
cancel: ".unsortable", cancel: ".unsortable",
update: function (e, ui) { update: function (e, ui) {