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

update grid macro picker to use new overlay component

Browse Source
This commit is contained in:
Mads Rasmussen
2015-12-09 13:14:09 +01:00
parent 227c6d8cb1
commit 4dd8ab227b
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,23 +5,40 @@ angular.module("umbraco")
$scope.title = "Click to insert macro";
$scope.setMacro = function(){
dialogService.macroPicker({
dialogData: {
richTextEditor: true,
macroData: $scope.control.value || {
macroAlias: $scope.control.editor.config && $scope.control.editor.config.macroAlias
? $scope.control.editor.config.macroAlias : ""
}
},
callback: function (data) {
$scope.control.value = {
macroAlias: data.macroAlias,
macroParamsDictionary: data.macroParamsDictionary
};
$scope.setPreview($scope.control.value );
var dialogData = {
richTextEditor: true,
macroData: $scope.control.value || {
macroAlias: $scope.control.editor.config && $scope.control.editor.config.macroAlias
? $scope.control.editor.config.macroAlias : ""
}
});
};
$scope.macroPickerOverlay = {};
$scope.macroPickerOverlay.view = "macropicker";
$scope.macroPickerOverlay.dialogData = dialogData;
$scope.macroPickerOverlay.show = true;
$scope.macroPickerOverlay.submit = function(model) {
var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
$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 = function(macro){
@@ -45,4 +62,3 @@ angular.module("umbraco")
}
}, 200);
});

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

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