From 0bedf09f48d240c5c859aefbb72080443a221386 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Tue, 8 Apr 2014 11:34:42 +0200
Subject: [PATCH] Fixes: U4-4609 v7.1 Media Picker datatype only allows
 selection of images not PDFs

---
 .../src/common/directives/html/umbphotofolder.directive.js  | 2 ++
 .../src/common/services/util.service.js                     | 6 +++---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less    | 4 ++--
 .../src/views/common/dialogs/mediapicker.html               | 5 ++---
 .../views/propertyeditors/folderbrowser/folderbrowser.html  | 2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
index a0f1455800..84f4f2b974 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
@@ -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;
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
index 5f37cbe73d..727319e93d 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/util.service.js
@@ -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);
diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index a9a2b783fe..036dafec08 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -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;
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
index 54c52531be..4492b24d2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
@@ -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>	
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
index e0954ad64c..54d911fb6a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html
@@ -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" />