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

update image properties to match media grid component

Browse Source
This commit is contained in:
Mads Rasmussen
2017-02-16 19:59:45 +01:00
parent bd38dde1fc
commit d5f66ebe02
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -254,15 +254,30 @@ angular.module("umbraco")
$scope.loading = true;
entityResource.getPagedDescendants($scope.startNodeId, "Media", $scope.searchOptions)
.then(function (data) {
// update image data to work with image grid
angular.forEach(data.items, function(mediaItem){
// set thumbnail and src
mediaItem.thumbnail = mediaHelper.resolveFileFromEntity(mediaItem, true);
mediaItem.image = mediaHelper.resolveFileFromEntity(mediaItem, false);
// set properties to match a media object
mediaItem.properties = [
{
alias: "umbracoWidth",
value: mediaItem.metaData.umbracoWidth.Value
},
{
alias: "umbracoHeight",
value: mediaItem.metaData.umbracoHeight.Value
}
];
});
// update images
$scope.images = data.items ? data.items : [];
// update pagination
$scope.searchOptions = {
pageNumber: data.pageNumber,
pageSize: data.pageSize,
totalItems: data.totalItems,
totalPages: data.totalPages
};
$scope.searchOptions.pageNumber = data.pageNumber;
$scope.searchOptions.pageSize = data.pageSize;
$scope.searchOptions.totalItems = data.totalItems;
$scope.searchOptions.totalPages = data.totalPages;
// set already selected images to selected
preSelectImages();
$scope.loading = false;
@@ -273,7 +288,7 @@ angular.module("umbraco")
$scope.loading = true;
mediaResource.getChildren(id)
.then(function(data) {
$scope.searchTerm = "";
$scope.searchOptions.filter = "";
$scope.images = data.items ? data.items : [];
// set already selected images to selected
preSelectImages();

8
src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
View File

@@ -17,7 +17,7 @@
<div class="form-search">
<i class="icon-search"></i>
<input
class="umb-search-field search-query"
class="umb-search-field search-query -full-width-input"
ng-model="searchOptions.filter"
localize="placeholder"
placeholder="@placeholders_search"
@@ -37,7 +37,7 @@
</div>
<div class="row umb-control-group" ng-if="!searchTerm">
<div class="row umb-control-group" ng-if="!searchOptions.filter">
<ul class="umb-breadcrumbs">
<li ng-hide="startNodeId != -1" class="umb-breadcrumbs__ancestor">
<a href ng-click="gotoFolder()" prevent-default>Media</a>
@@ -75,7 +75,7 @@
files-queued="onFilesQueue"
accept="{{acceptedFileTypes}}"
max-file-size="{{maxFileSize}}"
hide-dropzone="{{!activeDrag && images.length > 0 || searchTerm }}"
hide-dropzone="{{!activeDrag && images.length > 0 || searchOptions.filter }}"
compact="{{ images.length > 0 }}">
</umb-file-dropzone>
@@ -101,7 +101,7 @@
</div>
<umb-empty-state
ng-if="searchTerm && images.length === 0 && !loading"
ng-if="searchOptions.filter && images.length === 0 && !loading"
position="center">
<localize key="general_searchNoResult"></localize>
</umb-empty-state>