Fixes: U4-4609 v7.1 Media Picker datatype only allows selection of images not PDFs

This commit is contained in:
perploug
2014-04-08 11:34:42 +02:00
parent 41ad18deef
commit 0bedf09f48
5 changed files with 10 additions and 9 deletions

View File

@@ -26,6 +26,8 @@ angular.module("umbraco.directives.html")
var imagesOnly = element.attr('images-only') === "true";
var margin = element.attr('border') ? parseInt(element.attr('border'), 10) : 5;
var startingIndex = element.attr('baseline') ? parseInt(element.attr('baseline'), 10) : 0;
var minWidth = element.attr('min-width') ? parseInt(element.attr('min-width'), 10) : 420;

View File

@@ -259,10 +259,10 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
//first fill in all of the original image sizes and URLs
for (var i = startingIndex; i < images.length; i++) {
var item = images[0];
var item = images[i];
this.setImageData(images[i]);
this.setOriginalSize(images[i], maxRowHeight);
this.setImageData(item);
this.setOriginalSize(item, maxRowHeight);
if(imagesOnly && !item.isFolder && !item.thumbnail){
images.splice(i, 1);

View File

@@ -398,8 +398,8 @@ ul.color-picker li a {
.umb-photo-folder .umb-non-thumbnail i{
color: @grayLight;
font-size: 70px;
line-height: 80px;
font-size: 50px;
line-height: 60px;
display: block;
margin: auto;
padding-top: 20px;

View File

@@ -100,15 +100,14 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
<div class="umb-panel-body with-footer">
<div style="height: 10px; margin: 10px 0px 10px 0px" class="umb-loader"
ng-hide="active() == 0"></div>
<umb-photo-folder
min-height="75"
min-height="105"
min-width="150"
max-height="250"
ideal-items-per-row="3"
on-click="clickHandler"
ng-model="images"
images-only="true"
images-only="{{onlyImages}}"
filter-by="searchTerm"/>
</div>

View File

@@ -20,7 +20,7 @@
</umb-upload-dropzone>
<umb-photo-folder
min-height="100"
min-height="105"
min-width="220"
on-click="clickHandler"
ng-model="images" />