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

use infinite macropicker in partial views and partial view macro editior

Browse Source
This commit is contained in:
Mads Rasmussen
2018-08-01 20:06:35 +02:00
parent 3e36e06d77
commit 759c21cec9
6 changed files with 16 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/insertcodesnippet/insertcodesnippet.controller.js
View File

@@ -28,27 +28,22 @@
}
function openMacroPicker() {
vm.macroPickerOverlay = {
view: "macropicker",
var macroPicker = {
dialogData: {},
show: true,
submit: function(model) {
$scope.model.insert = {
"type": "macro",
"macroParams": model.macroParams,
"selectedMacro": model.selectedMacro
};
$scope.model.submit($scope.model);
vm.macroPickerOverlay.show = false;
vm.macroPickerOverlay = null;
editorService.close();
},
close: function() {
editorService.close();
}
};
editorService.macroPicker(macroPicker);
}
function openPageFieldOverlay() {

19
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js
View File

@@ -154,28 +154,19 @@
}
function openMacroOverlay() {
vm.macroPickerOverlay = {
view: "macropicker",
var macroPicker = {
dialogData: {},
show: true,
submit: function (model) {
var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
insert(macroObject.syntax);
vm.macroPickerOverlay.show = false;
vm.macroPickerOverlay = null;
editorService.close();
},
close: function(oldModel) {
// close the dialog
vm.macroPickerOverlay.show = false;
vm.macroPickerOverlay = null;
// focus editor
close: function() {
editorService.close();
vm.editor.focus();
}
};
editorService.macroPicker(macroPicker);
}

7
src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.html
View File

@@ -76,11 +76,4 @@
</umb-editor-view>
</form>
<umb-overlay
ng-if="vm.macroPickerOverlay.show"
model="vm.macroPickerOverlay"
view="vm.macroPickerOverlay.view"
position="right">
</umb-overlay>
</div>

20
src/Umbraco.Web.UI.Client/src/views/partialviews/edit.controller.js
View File

@@ -161,31 +161,21 @@
function openMacroOverlay() {
vm.macroPickerOverlay = {
view: "macropicker",
var macroPicker = {
dialogData: {},
show: true,
submit: function (model) {
var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, "Mvc");
insert(macroObject.syntax);
vm.macroPickerOverlay.show = false;
vm.macroPickerOverlay = null;
editorService.close();
},
close: function(oldModel) {
// close the dialog
vm.macroPickerOverlay.show = false;
vm.macroPickerOverlay = null;
// focus editor
close: function() {
editorService.close();
vm.editor.focus();
}
};
editorService.macroPicker(macroPicker);
}
function openPageFieldOverlay() {
var insertFieldEditor = {
submit: function (model) {

7
src/Umbraco.Web.UI.Client/src/views/partialviews/edit.html
View File

@@ -84,11 +84,4 @@
</umb-editor-view>
</form>
<umb-overlay
ng-if="vm.macroPickerOverlay.show"
model="vm.macroPickerOverlay"
view="vm.macroPickerOverlay.view"
position="right">
</umb-overlay>
</div>

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

@@ -123,12 +123,5 @@
</umb-editor-view>
</form>
<umb-overlay
ng-if="vm.masterTemplateOverlay.show"
model="vm.masterTemplateOverlay"
view="vm.masterTemplateOverlay.view"
position="right">
</umb-overlay>
</div>