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

use infinite macro picker in grid

Browse Source
This commit is contained in:
Mads Rasmussen
2018-08-21 20:01:55 +02:00
parent dcdf21d86c
commit 6678f42f42
2 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.controller.js
View File

@@ -1,6 +1,6 @@
angular.module("umbraco")
.controller("Umbraco.PropertyEditors.Grid.MacroController",
function ($scope, $rootScope, $timeout, dialogService, macroResource, macroService, $routeParams) {
function ($scope, $timeout, editorService, macroResource, macroService, $routeParams) {
$scope.title = "Click to insert macro";
@@ -14,31 +14,24 @@ angular.module("umbraco")
}
};
$scope.macroPickerOverlay = {};
$scope.macroPickerOverlay.view = "macropicker";
$scope.macroPickerOverlay.dialogData = dialogData;
$scope.macroPickerOverlay.show = true;
var macroPicker = {
dialogData: dialogData,
submit: function(model) {
var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
$scope.macroPickerOverlay.submit = function(model) {
var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
$scope.control.value = {
$scope.control.value = {
macroAlias: macroObject.macroAlias,
macroParamsDictionary: macroObject.macroParamsDictionary
};
$scope.setPreview($scope.control.value );
$scope.macroPickerOverlay.show = false;
$scope.macroPickerOverlay = null;
};
$scope.macroPickerOverlay.close = function(oldModel) {
$scope.macroPickerOverlay.show = false;
$scope.macroPickerOverlay = null;
};
};
$scope.setPreview($scope.control.value );
editorService.close();
},
close: function() {
editorService.close();
}
}
editorService.macroPicker(macroPicker);
};
$scope.setPreview = function(macro){

9
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/macro.html
View File

@@ -12,12 +12,5 @@
</div>
</div>
</div>
<umb-overlay
ng-if="macroPickerOverlay.show"
model="macroPickerOverlay"
view="macroPickerOverlay.view"
position="right">
</umb-overlay>
</div>