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

use infinite queryBuilder and treePicker in template editor

Browse Source
This commit is contained in:
Mads Rasmussen
2018-07-04 09:48:40 +02:00
parent 5466287063
commit 534788cc38
2 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
View File

@@ -1,7 +1,7 @@
(function () {
"use strict";
function TemplatesEditController($scope, $routeParams, $timeout, templateResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, treeService, contentEditingHelper, localizationService, angularHelper, templateHelper) {
function TemplatesEditController($scope, $routeParams, $timeout, templateResource, assetsService, notificationsService, editorState, navigationService, appState, macroService, treeService, contentEditingHelper, localizationService, angularHelper, templateHelper, editorService) {
var vm = this;
var oldMasterTemplateAlias = null;
@@ -436,31 +436,28 @@
var title = values[0];
var emptyStateMessage = values[1];
vm.dictionaryItemOverlay = {
view: "treepicker",
var dictionaryItem = {
section: "settings",
treeAlias: "dictionary",
entityType: "dictionary",
multiPicker: false,
show: true,
title: title,
emptyStateMessage: emptyStateMessage,
select: function(node){
var code = templateHelper.getInsertDictionarySnippet(node.name);
insert(code);
vm.dictionaryItemOverlay.show = false;
vm.dictionaryItemOverlay = null;
editorService.close();
},
close: function (model) {
// close dialog
vm.dictionaryItemOverlay.show = false;
vm.dictionaryItemOverlay = null;
editorService.close();
// focus editor
vm.editor.focus();
}
};
editorService.treePicker(dictionaryItem);
});
}
@@ -504,26 +501,19 @@
}
function openQueryBuilderOverlay() {
vm.queryBuilderOverlay = {
view: "querybuilder",
show: true,
var queryBuilder = {
submit: function (model) {
var code = templateHelper.getQuerySnippet(model.result.queryExpression);
insert(code);
vm.queryBuilderOverlay.show = false;
vm.queryBuilderOverlay = null;
editorService.close();
},
close: function (model) {
// close dialog
vm.queryBuilderOverlay.show = false;
vm.queryBuilderOverlay = null;
close: function () {
editorService.close();
// focus editor
vm.editor.focus();
}
};
editorService.queryBuilder(queryBuilder);
}

14
src/Umbraco.Web.UI.Client/src/views/templates/edit.html
View File

@@ -145,20 +145,6 @@
view="vm.pageFieldOverlay.view">
</umb-overlay>
<umb-overlay
ng-if="vm.dictionaryItemOverlay.show"
model="vm.dictionaryItemOverlay"
position="right"
view="vm.dictionaryItemOverlay.view">
</umb-overlay>
<umb-overlay
ng-if="vm.queryBuilderOverlay.show"
model="vm.queryBuilderOverlay"
position="right"
view="vm.queryBuilderOverlay.view">
</umb-overlay>
<umb-overlay
ng-if="vm.sectionsOverlay.show"
model="vm.sectionsOverlay"