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

Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7

Browse Source
This commit is contained in:
Sebastiaan Janssen
2016-01-14 15:06:39 +01:00
parent f057976f78 151c28a20f
commit d9542f4ca5
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -306,6 +306,28 @@ angular.module("umbraco")
});
};
// *********************************************
// Control management functions
// *********************************************
$scope.editControlSettings = function (control) {
var obj = $scope.model.config;
obj.items.config = control.editor.config.settings;
dialogService.open(
{
template: "views/propertyeditors/grid/dialogs/config.html",
gridItem: { "config": (control.value ? control.value.settings : null) },
itemType: null,
config: obj,
callback: function (data) {
control.settings = data.config;
}
});
};
// *********************************************
// Area management functions

11
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -169,6 +169,15 @@
<i class="icon icon-settings" title="@grid_settings" localize="title"></i>
</a>
</div>
<!-- control setting area -->
<div class="cell-tools-edit" ng-style="hasSettings && $first && {'top': '99px'}" ng-if="control.editor.config && control.editor.config.settings">
<a class="iconBox"
ng-click="editControlSettings(control)"
href>
<i class="icon icon-hammer"></i>
</a>
</div>
</div>
@@ -261,4 +270,4 @@
</div>
</div>
</div>
</div>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
View File

@@ -109,7 +109,7 @@ angular.module('umbraco')
//NOTE: The 'entity' can be either a normal media entity or an "entity" returned from the entityResource
// they contain different data structures so if we need to query against it we need to be aware of this.
mediaHelper.registerFileResolver("Umbraco.ImageCropper", function (property, entity, thumbnail) {
if (property.value.src) {
if (property.value && property.value.src) {
if (thumbnail === true) {
return property.value.src + "?width=500&mode=max";