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

Missing files in last commit

Browse Source
This commit is contained in:
perploug
2014-04-03 00:40:36 +02:00
parent d0c6c4aafa
commit a4e23ef82b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
View File

@@ -24,9 +24,8 @@ angular.module("umbraco.directives.html")
scope.clickHandler = scope.$eval(element.attr('on-click'));
//todo: this doesn't do anything
var imagesOnly = element.attr('imagesOnly');
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;
@@ -36,7 +35,7 @@ angular.module("umbraco.directives.html")
var fixedRowWidth = Math.max(element.width(), minWidth);
scope.containerStyle = { width: fixedRowWidth + "px" };
scope.rows = umbPhotoFolderHelper.buildGrid(photos, fixedRowWidth, maxHeight, startingIndex, minHeight, idealImgPerRow, margin);
scope.rows = umbPhotoFolderHelper.buildGrid(photos, fixedRowWidth, maxHeight, startingIndex, minHeight, idealImgPerRow, margin, imagesOnly);
if (attrs.filterBy) {
@@ -51,7 +50,7 @@ angular.module("umbraco.directives.html")
if (newVal && newVal !== oldVal) {
var p = $filter('filter')(photos, newVal, false);
scope.baseline = 0;
var m = umbPhotoFolderHelper.buildGrid(p, fixedRowWidth, maxHeight, startingIndex, minHeight, idealImgPerRow, margin);
var m = umbPhotoFolderHelper.buildGrid(p, fixedRowWidth, maxHeight, startingIndex, minHeight, idealImgPerRow, margin, imagesOnly);
scope.rows = m;
}
});

1
src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
View File

@@ -108,6 +108,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
ideal-items-per-row="3"
on-click="clickHandler"
ng-model="images"
images-only="true"
filter-by="searchTerm"/>
</div>