mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 07:47:00 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/adrianbj/processwire into adrianbj-master

Browse Source
This commit is contained in:
Ryan Cramer
2016-10-04 16:12:36 -04:00
parent c5eaf61dfc e64352fbcf
commit 8977302991
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.js
View File

@@ -2,7 +2,7 @@
function TemplateFieldAddDialog() {
var $a = $(this);
var closeOnSave = false;
var fieldReady = false;
var $iframe = pwModalWindow($a.attr('href'), {}, 'large');
$iframe.load(function() {
@@ -29,28 +29,7 @@ function TemplateFieldAddDialog() {
'class': ($button.is('.ui-priority-secondary') ? 'ui-priority-secondary' : ''),
'click': function() {
$button.click();
if(closeOnSave) setTimeout(function() {
var newFieldId = $icontents.find("#Inputfield_id:last").val();
$iframe.dialog('close');
var numOptions = $('#fieldgroup_fields option').size();
$("#fieldgroup_fields option").eq(1).before($("<option></option>").val(newFieldId).text($icontents.find("#Inputfield_name").val()));
$('#fieldgroup_fields option[value="'+newFieldId+'"]')
.attr('id', 'asm0option'+numOptions)
.attr('data-desc', ($icontents.find("#field_label").val()))
.attr('data-status', ($icontents.find("#Inputfield_type option:selected").text()));
$("#asmSelect0 option").eq(1).before($("<option></option>").val(newFieldId).text($icontents.find("#Inputfield_name").val()));
$("#asmSelect0").find('option:selected').removeAttr("selected");
$('#asmSelect0 option[value="'+newFieldId+'"]')
.attr('rel', 'asm0option'+numOptions)
.attr('selected', 'selected')
.addClass('asmOptionDisabled')
.attr('disabled', 'disabled')
.trigger('change')
.removeAttr("selected");
}, 500);
closeOnSave = true;
fieldReady = true;
}
};
n++;
@@ -58,6 +37,37 @@ function TemplateFieldAddDialog() {
$button.hide();
});
// if field has been saved once, now offer a Close & Add button
if(fieldReady) {
buttons[n] = {
'text': 'Close & Add',
'class': ($button.is('.ui-priority-secondary') ? 'ui-priority-secondary' : ''),
'click': function() {
setTimeout(function() {
var newFieldId = $icontents.find("#Inputfield_id:last").val();
$iframe.dialog('close');
var numOptions = $('#fieldgroup_fields option').size();
$("#fieldgroup_fields option").eq(1).before($("<option></option>").val(newFieldId).text($icontents.find("#Inputfield_name").val()));
$('#fieldgroup_fields option[value="'+newFieldId+'"]')
.attr('id', 'asm0option'+numOptions)
.attr('data-desc', ($icontents.find("#field_label").val()))
.attr('data-status', ($icontents.find("#Inputfield_type option:selected").text()));
$("#asmSelect0 option").eq(1).before($("<option></option>").val(newFieldId).text($icontents.find("#Inputfield_name").val()));
$("#asmSelect0").find('option:selected').removeAttr("selected");
$('#asmSelect0 option[value="'+newFieldId+'"]')
.attr('rel', 'asm0option'+numOptions)
.attr('selected', 'selected')
.addClass('asmOptionDisabled')
.attr('disabled', 'disabled')
.trigger('change')
.removeAttr("selected");
}, 500);
}
};
}
$iframe.setButtons(buttons);
});

2
wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.min.js vendored
View File

@@ -1 +1 @@
function TemplateFieldAddDialog(){var b=$(this);var a=false;var c=pwModalWindow(b.attr("href"),{},"large");c.load(function(){var d=[];var e=c.contents();var f=0;e.find("#breadcrumbs ul.nav, #Inputfield_submit_save_field_copy").hide();e.find("#content form button.ui-button[type=submit]").each(function(){var h=$(this);var j=h.text();var g=false;for(i=0;i<d.length;i++){if(d[i].text==j||j.length<1){g=true}}if(!g){d[f]={text:j,"class":(h.is(".ui-priority-secondary")?"ui-priority-secondary":""),click:function(){h.click();if(a){setTimeout(function(){var l=e.find("#Inputfield_id:last").val();c.dialog("close");var k=$("#fieldgroup_fields option").size();$("#fieldgroup_fields option").eq(1).before($("<option></option>").val(l).text(e.find("#Inputfield_name").val()));$('#fieldgroup_fields option[value="'+l+'"]').attr("id","asm0option"+k).attr("data-desc",(e.find("#field_label").val())).attr("data-status",(e.find("#Inputfield_type option:selected").text()));$("#asmSelect0 option").eq(1).before($("<option></option>").val(l).text(e.find("#Inputfield_name").val()));$("#asmSelect0").find("option:selected").removeAttr("selected");$('#asmSelect0 option[value="'+l+'"]').attr("rel","asm0option"+k).attr("selected","selected").addClass("asmOptionDisabled").attr("disabled","disabled").trigger("change").removeAttr("selected")},500)}a=true}};f++}h.hide()});c.setButtons(d)});return false}$(document).ready(function(){$("#wrap_fieldgroup_fields p.description a").click(TemplateFieldAddDialog)});
function TemplateFieldAddDialog(){var a=$(this),b=!1,c=pwModalWindow(a.attr("href"),{},"large");return c.load(function(){var a=[],d=c.contents(),e=0;d.find("#breadcrumbs ul.nav, #Inputfield_submit_save_field_copy").hide(),d.find("#content form button.ui-button[type=submit]").each(function(){var c=$(this),d=c.text(),f=!1;for(i=0;i<a.length;i++)(a[i].text==d||d.length<1)&&(f=!0);f||(a[e]={text:d,class:c.is(".ui-priority-secondary")?"ui-priority-secondary":"",click:function(){c.click(),b=!0}},e++),c.hide()}),b&&(a[e]={text:"Close & Add",class:$button.is(".ui-priority-secondary")?"ui-priority-secondary":"",click:function(){setTimeout(function(){var a=d.find("#Inputfield_id:last").val();c.dialog("close");var b=$("#fieldgroup_fields option").size();$("#fieldgroup_fields option").eq(1).before($("<option></option>").val(a).text(d.find("#Inputfield_name").val())),$('#fieldgroup_fields option[value="'+a+'"]').attr("id","asm0option"+b).attr("data-desc",d.find("#field_label").val()).attr("data-status",d.find("#Inputfield_type option:selected").text()),$("#asmSelect0 option").eq(1).before($("<option></option>").val(a).text(d.find("#Inputfield_name").val())),$("#asmSelect0").find("option:selected").removeAttr("selected"),$('#asmSelect0 option[value="'+a+'"]').attr("rel","asm0option"+b).attr("selected","selected").addClass("asmOptionDisabled").attr("disabled","disabled").trigger("change").removeAttr("selected")},500)}}),c.setButtons(a)}),!1}$(document).ready(function(){$("#wrap_fieldgroup_fields p.description a").click(TemplateFieldAddDialog)});