Fixes: U4-4558 U7 Macro Parameter Editors needs some love!

perploug · perploug · commit 300bd3bed466 · 2014-04-02T13:19:26.000+02:00
Adds some config to the media picker and fixes thumbnail issues
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
@@ -102,6 +102,7 @@ function tinyMceService(dialogService, $log, imageHelper, $http, $timeout, macro
                     dialogService.mediaPicker({
                         currentTarget: currentTarget,
                         onlyImages: true,
+                        showDetails: true,
                         scope: $scope, callback: function (img) {
 
                             if (img) {
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
@@ -29,9 +29,9 @@ function umbPhotoFolderHelper($compile, $log, $timeout, $filter, imageHelper, me
             img.thumbnail = mediaHelper.resolveFile(img, true);
             img.image = mediaHelper.resolveFile(img, false);
 
-            if (!img.thumbnail){
-                img.thumbnail = "none";
-            }
+           // if (!img.thumbnail){
+           //     img.thumbnail = "none";
+           // }
         },
 
         /** sets the images original size properties - will check if it is a folder and if so will just make it square */
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
@@ -4,7 +4,9 @@ angular.module("umbraco")
         function ($scope, mediaResource, umbRequestHelper, entityResource, $log, mediaHelper, eventsService, treeService, $cookies) {
 
             var dialogOptions = $scope.$parent.dialogOptions;
+
             $scope.onlyImages = dialogOptions.onlyImages;
+            $scope.showDetails = dialogOptions.showDetails;
             $scope.multiPicker = (dialogOptions.multiPicker && dialogOptions.multiPicker !== "0") ? true : false;
             $scope.startNodeId = dialogOptions.startNodeId ? dialogOptions.startNodeId : -1;
 
@@ -96,12 +98,15 @@ angular.module("umbraco")
                 }else{
                     eventsService.emit("dialogs.mediaPicker.select", image);
                     
+                    //we have 3 options add to collection (if multi) show details, or submit it right back to the callback
                     if ($scope.multiPicker) {
                         $scope.select(image);
                         image.cssclass = ($scope.dialogData.selection.indexOf(image) > -1) ? "selected" : "";
-                    }else {
+                    }else if($scope.showDetails) {
                         $scope.target= image;
                         $scope.target.url = mediaHelper.resolveFile(image);
+                    }else{
+                        $scope.submit(image);
                     }
                 }
             };
@@ -114,6 +119,7 @@ angular.module("umbraco")
                 $scope.target = undefined;
             };
 
+            /*
             $scope.selectFolder= function(folder) {
                 if ($scope.multiPicker) {
                     $scope.select(folder);
@@ -136,7 +142,7 @@ angular.module("umbraco")
                         $scope.submit(image);
                     }
                 }
-            };
+            };*/
 
             //default root item
             if(!$scope.target){
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-photo-folder.html b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-photo-folder.html
@@ -7,15 +7,14 @@
 
             <a href="#media/media/edit/{{img.id}}"
                 ng-click="clickHandler(img, $event, false)"
-                ng-switch="img.thumbnail"
                 title="{{img.name}}">
 
-                <div ng-style="img.style" class="umb-non-thumbnail" ng-switch-when="none">
+                <div ng-style="img.style" class="umb-non-thumbnail" ng-if="!img.thumbnail">
                     <i class="icon large {{img.icon}}"></i>
                     {{img.name}}
                 </div>
             
-                <div ng-switch-default class="umb-photo" ng-style="img.thumbStyle" alt="{{img.name}}"></div>
+                <div ng-if="img.thumbnail" class="umb-photo" ng-style="img.thumbStyle" alt="{{img.name}}"></div>
             </a>
 
             <a href ng-click="clickHandler(img, $event, true)" ng-show="img.contentTypeAlias === 'Folder'" class="selector-overlay">
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
@@ -87,7 +87,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
                     $scope.ids = r;
                     $scope.sync();
                 }, 500, false);
-                
             }
         };
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -2,7 +2,7 @@
 
 	<ul ui-sortable="sortableOptions" ng-model="images" class="umb-sortable-thumbnails">
 		<li style="width: 120px; height: 100px; overflow: hidden;" ng-repeat="image in images">
-				<img ng-src="{{image.thumbnail}}" alt="" ng-show="image.thumbnail">
+				<img ng-src="{{image.thumbnail}}" alt="meh?" ng-show="image.thumbnail">
 
 				<span class="icon-holder" ng-hide="image.thumbnail">
 					<i class="icon {{image.icon}} large" ></i>

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl`
`87`	`87`	`$scope.ids = r;`
`88`	`88`	`$scope.sync();`
`89`	`89`	`}, 500, false);`
`90`		`-`
`91`	`90`	`}`
`92`	`91`	`};`
`93`	`92`