diff --git a/wire/modules/Process/ProcessField/ProcessField.js b/wire/modules/Process/ProcessField/ProcessField.js index 8f57f2fe..584b0bfa 100644 --- a/wire/modules/Process/ProcessField/ProcessField.js +++ b/wire/modules/Process/ProcessField/ProcessField.js @@ -3,9 +3,10 @@ $(document).ready(function() { var fieldFilterFormChange = function() { $("#field_filter_form").submit(); }; - $("#templates_id").change(fieldFilterFormChange); - $("#fieldtype").change(fieldFilterFormChange); - $("#wrap_show_system input").click(fieldFilterFormChange); + + $("#templates_id").on('change', fieldFilterFormChange); + $("#fieldtype").on('change', fieldFilterFormChange); + $("#wrap_show_system input").on('click', fieldFilterFormChange); var $asmListItemStatus = $("#asmListItemStatus"); @@ -29,8 +30,8 @@ $(document).ready(function() { $asmListItemStatus.val(tpl); } - $("#Inputfield_showIf").change(setAsmListItemStatus); - $("#Inputfield_required").change(setAsmListItemStatus); + $("#Inputfield_showIf").on('change', setAsmListItemStatus); + $("#Inputfield_required").on('change', setAsmListItemStatus); setAsmListItemStatus(); $('.columnWidthInput').each(function() { @@ -56,7 +57,7 @@ $(document).ready(function() { // $("#asmListItemStatus").val($columnWidth.val()); // update the slider if the columnWidth field is changed manually - $columnWidth.change(function() { + $columnWidth.on('change', function() { var val = parseInt($(this).val()); if(val > 100) val = 100; if(val < 10) val = 10; @@ -73,11 +74,11 @@ $(document).ready(function() { items: $(".Inputfields li.WireTab"), id: 'FieldEditTabs', skipRememberTabIDs: ['delete'] - }); + }); } // change fieldgroup context - $("#fieldgroupContextSelect").change(function() { + $("#fieldgroupContextSelect").on('change', function() { var field_id = $("#Inputfield_id").val(); var fieldgroup_id = $(this).val(); var href = './edit?id=' + field_id; @@ -85,14 +86,14 @@ $(document).ready(function() { window.location = href; }); - $("a.fieldFlag").click(function() { + $("a.fieldFlag").on('click', function() { if($(this).attr('href') === '#') return false; }); - $("#export_data").click(function() { $(this).select(); }); + $("#export_data").on('click', function() { $(this).select(); }); // export and import functions - $(".import_toggle input[type=radio]").change(function() { + $(".import_toggle input[type=radio]").on('change', function() { var $table = $(this).parents('p.import_toggle').next('table'); var $fieldset = $(this).closest('.InputfieldFieldset'); if($(this).is(":checked") && $(this).val() == 0) { @@ -102,25 +103,25 @@ $(document).ready(function() { $table.show(); $fieldset.removeClass('ui-priority-secondary'); } - }).change(); + }).trigger('change'); // allow processInput to ignore this field when applicable - $("#wrap_Inputfield_send_templates").find(":input").change(function() { + $("#wrap_Inputfield_send_templates").find(":input").on('change', function() { $("#_send_templates_changed").val('changed'); }); // setup access control tab - $("#viewRoles_37").click(function() { + $("#viewRoles_37").on('click', function() { // if guest has view, then all have view // if($(this).is(":checked")) $("input.viewRoles").attr('checked', 'checked'); // JQM if($(this).is(":checked")) $("input.viewRoles").prop('checked', true); }); - $("input.viewRoles:not(#viewRoles_37)").click(function() { + $("input.viewRoles:not(#viewRoles_37)").on('click', function() { // prevent unchecking 'view' for other roles when 'guest' role is checked if($("#viewRoles_37").is(":checked")) return false; return true; }); - $("input.editRoles:not(:disabled)").click(function() { + $("input.editRoles:not(:disabled)").on('click', function() { if($(this).is(":checked")) { // if editable is checked, then viewable must also be checked // $(this).closest('tr').find("input.viewRoles").attr('checked', 'checked'); // JQM @@ -129,7 +130,7 @@ $(document).ready(function() { }); // select-all link for overrides tab - $(".override-select-all").click(function() { + $(".override-select-all").on('click', function() { var $checkboxes = $(this).closest('table').find("input[type=checkbox]"); if($(this).hasClass('override-checked')) { // $checkboxes.removeAttr('checked'); // JQM diff --git a/wire/modules/Process/ProcessField/ProcessField.min.js b/wire/modules/Process/ProcessField/ProcessField.min.js index 63b45da3..1de7db2a 100644 --- a/wire/modules/Process/ProcessField/ProcessField.min.js +++ b/wire/modules/Process/ProcessField/ProcessField.min.js @@ -1 +1 @@ -$(document).ready(function(){var fieldFilterFormChange=function(){$("#field_filter_form").submit()};$("#templates_id").change(fieldFilterFormChange);$("#fieldtype").change(fieldFilterFormChange);$("#wrap_show_system input").click(fieldFilterFormChange);var $asmListItemStatus=$("#asmListItemStatus");var $columnWidth=$("#columnWidth");function setAsmListItemStatus(){var tpl=$asmListItemStatus.attr("data-tpl");if(!tpl)return;var showIf=$("#Inputfield_showIf").val();var required=$("#Inputfield_required").is(":checked")?true:false;if(showIf&&showIf.length>0)tpl=""+tpl;if(required)tpl=""+tpl;var w=parseInt($columnWidth.val());if(w==100)w=0;if(w>0)w=w+"%";else w="";tpl=tpl.replace("%",w);$asmListItemStatus.val(tpl)}$("#Inputfield_showIf").change(setAsmListItemStatus);$("#Inputfield_required").change(setAsmListItemStatus);setAsmListItemStatus();$(".columnWidthInput").each(function(){var $columnWidth=$(this);var $slider=$("
");var columnWidthVal=parseInt($columnWidth.val());$columnWidth.val(columnWidthVal+"%");$columnWidth.after($slider);$slider.slider({range:"min",min:10,max:100,value:parseInt($columnWidth.val()),slide:function(e,ui){var val=ui.value+"%";$columnWidth.val(val).trigger("change");if($columnWidth.prop("id")==="columnWidth")setAsmListItemStatus()}});$columnWidth.change(function(){var val=parseInt($(this).val());if(val>100)val=100;if(val<10)val=10;$(this).val(val+"%");$slider.slider("option","value",val)})});var $fieldEdit=$("#ProcessFieldEdit");if($fieldEdit.length>0&&$("li.WireTab").length>1){$fieldEdit.find("script").remove();$fieldEdit.WireTabs({items:$(".Inputfields li.WireTab"),id:"FieldEditTabs",skipRememberTabIDs:["delete"]})}$("#fieldgroupContextSelect").change(function(){var field_id=$("#Inputfield_id").val();var fieldgroup_id=$(this).val();var href="./edit?id="+field_id;if(fieldgroup_id>0)href+="&fieldgroup_id="+fieldgroup_id;window.location=href});$("a.fieldFlag").click(function(){if($(this).attr("href")==="#")return false});$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var $table=$(this).parents("p.import_toggle").next("table");var $fieldset=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){$table.hide();$fieldset.addClass("ui-priority-secondary")}else{$table.show();$fieldset.removeClass("ui-priority-secondary")}}).change();$("#wrap_Inputfield_send_templates").find(":input").change(function(){$("#_send_templates_changed").val("changed")});$("#viewRoles_37").click(function(){if($(this).is(":checked"))$("input.viewRoles").prop("checked",true)});$("input.viewRoles:not(#viewRoles_37)").click(function(){if($("#viewRoles_37").is(":checked"))return false;return true});$("input.editRoles:not(:disabled)").click(function(){if($(this).is(":checked")){$(this).closest("tr").find("input.viewRoles").prop("checked",true)}});$(".override-select-all").click(function(){var $checkboxes=$(this).closest("table").find("input[type=checkbox]");if($(this).hasClass("override-checked")){$checkboxes.prop("checked",false);$(this).removeClass("override-checked")}else{$checkboxes.prop("checked",true);$(this).addClass("override-checked")}return false});$(document).on("pw-modal-closed","a",function(e,ui){if(!$("#tab-overrides").is(":visible"))return;Inputfields.reload("#Inputfield_overrides_table")})}); \ No newline at end of file +$(document).ready(function(){var fieldFilterFormChange=function(){$("#field_filter_form").submit()};$("#templates_id").on("change",fieldFilterFormChange);$("#fieldtype").on("change",fieldFilterFormChange);$("#wrap_show_system input").on("click",fieldFilterFormChange);var $asmListItemStatus=$("#asmListItemStatus");var $columnWidth=$("#columnWidth");function setAsmListItemStatus(){var tpl=$asmListItemStatus.attr("data-tpl");if(!tpl)return;var showIf=$("#Inputfield_showIf").val();var required=$("#Inputfield_required").is(":checked")?true:false;if(showIf&&showIf.length>0)tpl=""+tpl;if(required)tpl=""+tpl;var w=parseInt($columnWidth.val());if(w==100)w=0;if(w>0)w=w+"%";else w="";tpl=tpl.replace("%",w);$asmListItemStatus.val(tpl)}$("#Inputfield_showIf").on("change",setAsmListItemStatus);$("#Inputfield_required").on("change",setAsmListItemStatus);setAsmListItemStatus();$(".columnWidthInput").each(function(){var $columnWidth=$(this);var $slider=$("
");var columnWidthVal=parseInt($columnWidth.val());$columnWidth.val(columnWidthVal+"%");$columnWidth.after($slider);$slider.slider({range:"min",min:10,max:100,value:parseInt($columnWidth.val()),slide:function(e,ui){var val=ui.value+"%";$columnWidth.val(val).trigger("change");if($columnWidth.prop("id")==="columnWidth")setAsmListItemStatus()}});$columnWidth.on("change",function(){var val=parseInt($(this).val());if(val>100)val=100;if(val<10)val=10;$(this).val(val+"%");$slider.slider("option","value",val)})});var $fieldEdit=$("#ProcessFieldEdit");if($fieldEdit.length>0&&$("li.WireTab").length>1){$fieldEdit.find("script").remove();$fieldEdit.WireTabs({items:$(".Inputfields li.WireTab"),id:"FieldEditTabs",skipRememberTabIDs:["delete"]})}$("#fieldgroupContextSelect").on("change",function(){var field_id=$("#Inputfield_id").val();var fieldgroup_id=$(this).val();var href="./edit?id="+field_id;if(fieldgroup_id>0)href+="&fieldgroup_id="+fieldgroup_id;window.location=href});$("a.fieldFlag").on("click",function(){if($(this).attr("href")==="#")return false});$("#export_data").on("click",function(){$(this).select()});$(".import_toggle input[type=radio]").on("change",function(){var $table=$(this).parents("p.import_toggle").next("table");var $fieldset=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){$table.hide();$fieldset.addClass("ui-priority-secondary")}else{$table.show();$fieldset.removeClass("ui-priority-secondary")}}).trigger("change");$("#wrap_Inputfield_send_templates").find(":input").on("change",function(){$("#_send_templates_changed").val("changed")});$("#viewRoles_37").on("click",function(){if($(this).is(":checked"))$("input.viewRoles").prop("checked",true)});$("input.viewRoles:not(#viewRoles_37)").on("click",function(){if($("#viewRoles_37").is(":checked"))return false;return true});$("input.editRoles:not(:disabled)").on("click",function(){if($(this).is(":checked")){$(this).closest("tr").find("input.viewRoles").prop("checked",true)}});$(".override-select-all").on("click",function(){var $checkboxes=$(this).closest("table").find("input[type=checkbox]");if($(this).hasClass("override-checked")){$checkboxes.prop("checked",false);$(this).removeClass("override-checked")}else{$checkboxes.prop("checked",true);$(this).addClass("override-checked")}return false});$(document).on("pw-modal-closed","a",function(e,ui){if(!$("#tab-overrides").is(":visible"))return;Inputfields.reload("#Inputfield_overrides_table")})}); \ No newline at end of file diff --git a/wire/modules/Process/ProcessModule/ProcessModule.js b/wire/modules/Process/ProcessModule/ProcessModule.js index 946e49f3..39c119a4 100644 --- a/wire/modules/Process/ProcessModule/ProcessModule.js +++ b/wire/modules/Process/ProcessModule/ProcessModule.js @@ -1,6 +1,6 @@ $(document).ready(function() { - $(".not_installed").parent("a").css('opacity', 0.6).click(function() { + $(".not_installed").parent("a").css('opacity', 0.6).on('click', function() { var name = $(this).children(".not_installed").attr('data-name'); var $btn = $(".install_" + name + ":visible"); @@ -19,7 +19,7 @@ $(document).ready(function() { return false; }); - $("button.ProcessModuleSettings").click(function() { + $("button.ProcessModuleSettings").on('click', function() { var $a = $(this).parents('tr').find('.ConfigurableModule').parent('a'); window.location.href = $a.attr('href') + '&collapse_info=1'; }); @@ -31,7 +31,7 @@ $(document).ready(function() { }); } - $("select.modules_section_select").change(function() { + $("select.modules_section_select").on('change', function() { var section = $(this).val(); var $sections = $(this).parent('p').siblings('.modules_section') if(section == '') { @@ -42,7 +42,7 @@ $(document).ready(function() { } document.cookie = $(this).attr('name') + '=' + section; return true; - }).change(); + }).trigger('change'); $(document).on('click', '#head_button a', function() { @@ -51,8 +51,8 @@ $(document).ready(function() { return true; }); - $("#Inputfield_new_seconds").change(function() { - $('#submit_check').removeAttr('hidden').click(); + $("#Inputfield_new_seconds").on('change', function() { + $('#submit_check').removeAttr('hidden').trigger('click'); $(this).closest('form').submit(); }); diff --git a/wire/modules/Process/ProcessModule/ProcessModule.min.js b/wire/modules/Process/ProcessModule/ProcessModule.min.js index 7b22168c..1442f6a8 100644 --- a/wire/modules/Process/ProcessModule/ProcessModule.min.js +++ b/wire/modules/Process/ProcessModule/ProcessModule.min.js @@ -1 +1 @@ -$(document).ready(function(){$(".not_installed").parent("a").css("opacity",.6).click(function(){var name=$(this).children(".not_installed").attr("data-name");var $btn=$(".install_"+name+":visible");var disabled=$btn.attr("disabled");if($btn.length){$btn.effect("highlight",1e3)}else{var color=$(this).css("color");$(this).closest("tr").find(".requires").attr("data-color",$(this).css("color")).css("color",color).effect("highlight",1e3)}return false});$("button.ProcessModuleSettings").click(function(){var $a=$(this).parents("tr").find(".ConfigurableModule").parent("a");window.location.href=$a.attr("href")+"&collapse_info=1"});if($("#modules_form").length>0){$("#modules_form").WireTabs({items:$(".Inputfields li.WireTab"),rememberTabs:true})}$("select.modules_section_select").change(function(){var section=$(this).val();var $sections=$(this).parent("p").siblings(".modules_section");if(section==""){$sections.show()}else{$sections.hide();$sections.filter(".modules_"+section).show()}document.cookie=$(this).attr("name")+"="+section;return true}).change();$(document).on("click","#head_button a",function(){document.cookie="WireTabs=tab_new_modules";return true});$("#Inputfield_new_seconds").change(function(){$("#submit_check").removeAttr("hidden").click();$(this).closest("form").submit()});$("#wrap_upload_module").removeClass("InputfieldItemList")}); \ No newline at end of file +$(document).ready(function(){$(".not_installed").parent("a").css("opacity",.6).on("click",function(){var name=$(this).children(".not_installed").attr("data-name");var $btn=$(".install_"+name+":visible");var disabled=$btn.attr("disabled");if($btn.length){$btn.effect("highlight",1e3)}else{var color=$(this).css("color");$(this).closest("tr").find(".requires").attr("data-color",$(this).css("color")).css("color",color).effect("highlight",1e3)}return false});$("button.ProcessModuleSettings").on("click",function(){var $a=$(this).parents("tr").find(".ConfigurableModule").parent("a");window.location.href=$a.attr("href")+"&collapse_info=1"});if($("#modules_form").length>0){$("#modules_form").WireTabs({items:$(".Inputfields li.WireTab"),rememberTabs:true})}$("select.modules_section_select").on("change",function(){var section=$(this).val();var $sections=$(this).parent("p").siblings(".modules_section");if(section==""){$sections.show()}else{$sections.hide();$sections.filter(".modules_"+section).show()}document.cookie=$(this).attr("name")+"="+section;return true}).trigger("change");$(document).on("click","#head_button a",function(){document.cookie="WireTabs=tab_new_modules";return true});$("#Inputfield_new_seconds").on("change",function(){$("#submit_check").removeAttr("hidden").trigger("click");$(this).closest("form").submit()});$("#wrap_upload_module").removeClass("InputfieldItemList")}); \ No newline at end of file diff --git a/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.js b/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.js index 9ef23d6c..734da833 100644 --- a/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.js +++ b/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.js @@ -1,18 +1,18 @@ $(document).ready(function() { $("#select_parent_submit").hide(); - $("#select_parent_id").change(function() { + $("#select_parent_id").on('change', function() { var val = $(this).val(); - if(val > 0) $("#select_parent_submit").click(); + if(val > 0) $("#select_parent_submit").trigger('click'); }); var submitted = false; - $("#ProcessPageAdd").submit(function() { + $("#ProcessPageAdd").on('submit', function() { if(submitted) return false; submitted = true; }); - $("#template").change(function() { + $("#template").on('change', function() { var $t = $(this); var val = $t.val(); var showPublish = false; @@ -33,7 +33,7 @@ $(document).ready(function() { $button2.fadeOut(); } } - }).change(); + }).trigger('change'); var existsTimer = null; var existsName = ''; @@ -66,7 +66,7 @@ $(document).ready(function() { } } - $("#Inputfield_title, #Inputfield__pw_page_name").keyup(function(e) { + $("#Inputfield_title, #Inputfield__pw_page_name").on('keyup', function(e) { if(existsTimer) clearTimeout(existsTimer); existsTimer = setTimeout(function() { checkExists(); }, 250); }); @@ -75,7 +75,7 @@ $(document).ready(function() { // we hide language tabs/inputs when such a template is selected if($(".langTabs").length) { var $template = $('#template'); - $template.change(function() { + $template.on('change', function() { var $option = $(this).find("option[value='" + $(this).val() + "']"); if(parseInt($option.attr('data-nolang')) > 0) { hideLanguageTabs(); diff --git a/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.min.js b/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.min.js index 1bd679fe..c8b664a7 100644 --- a/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.min.js +++ b/wire/modules/Process/ProcessPageAdd/ProcessPageAdd.min.js @@ -1 +1 @@ -$(document).ready(function(){$("#select_parent_submit").hide();$("#select_parent_id").change(function(){var val=$(this).val();if(val>0)$("#select_parent_submit").click()});var submitted=false;$("#ProcessPageAdd").submit(function(){if(submitted)return false;submitted=true});$("#template").change(function(){var $t=$(this);var val=$t.val();var showPublish=false;if($t.is("select")){var $option=$t.find("option[value='"+val+"']");if($option.attr("data-publish")==="1")showPublish=true}else{showPublish=$t.attr("data-publish")==="1"}var $button=$("#submit_publish").closest(".Inputfield");if($button.length){var $button2=$("#submit_publish_add").closest(".Inputfield");if(showPublish){$button.fadeIn();$button2.fadeIn()}else{$button.fadeOut();$button2.fadeOut()}}}).change();var existsTimer=null;var existsName="";var $nameInput=$("#Inputfield__pw_page_name");var $nameWrap=$("#wrap_Inputfield__pw_page_name");var $form=$nameInput.closest("form");var ajaxURL=$form.attr("data-ajax-url");var $dupNote=$("

"+$form.attr("data-dup-note")+"

");var $status=$("");$nameWrap.children(".InputfieldHeader").append($status.hide());$nameInput.after($dupNote.hide());function checkExists(){var parent_id=$("#Inputfield_parent_id").val();var name=$nameInput.val();if(existsName==name)return;if(parent_id&&name.length>0){existsName=name;$.get(ajaxURL+"exists?parent_id="+parent_id+"&name="+name,function(data){$status.html(" "+data).css("display","inline");if($(data).hasClass("taken")){$nameInput.addClass("ui-state-error-text");$dupNote.fadeIn("fast")}else{$nameInput.removeClass("ui-state-error-text");$dupNote.hide()}})}}$("#Inputfield_title, #Inputfield__pw_page_name").keyup(function(e){if(existsTimer)clearTimeout(existsTimer);existsTimer=setTimeout(function(){checkExists()},250)});if($(".langTabs").length){var $template=$("#template");$template.change(function(){var $option=$(this).find("option[value='"+$(this).val()+"']");if(parseInt($option.attr("data-nolang"))>0){hideLanguageTabs()}else{unhideLanguageTabs()}}).change();var noLang=$template.attr("data-nolang");if(typeof noLang!=="undefined"&&parseInt(noLang)>0){hideLanguageTabs()}}$(".InputfieldPageName .LanguageSupport input[type=text]").on("blur",function(){if($(this).val().length==0)return;var $checkbox=$(this).next("label").children("input");if(!$checkbox.is(":checked"))$checkbox.prop("checked",true)})}); \ No newline at end of file +$(document).ready(function(){$("#select_parent_submit").hide();$("#select_parent_id").on("change",function(){var val=$(this).val();if(val>0)$("#select_parent_submit").trigger("click")});var submitted=false;$("#ProcessPageAdd").on("submit",function(){if(submitted)return false;submitted=true});$("#template").on("change",function(){var $t=$(this);var val=$t.val();var showPublish=false;if($t.is("select")){var $option=$t.find("option[value='"+val+"']");if($option.attr("data-publish")==="1")showPublish=true}else{showPublish=$t.attr("data-publish")==="1"}var $button=$("#submit_publish").closest(".Inputfield");if($button.length){var $button2=$("#submit_publish_add").closest(".Inputfield");if(showPublish){$button.fadeIn();$button2.fadeIn()}else{$button.fadeOut();$button2.fadeOut()}}}).trigger("change");var existsTimer=null;var existsName="";var $nameInput=$("#Inputfield__pw_page_name");var $nameWrap=$("#wrap_Inputfield__pw_page_name");var $form=$nameInput.closest("form");var ajaxURL=$form.attr("data-ajax-url");var $dupNote=$("

"+$form.attr("data-dup-note")+"

");var $status=$("");$nameWrap.children(".InputfieldHeader").append($status.hide());$nameInput.after($dupNote.hide());function checkExists(){var parent_id=$("#Inputfield_parent_id").val();var name=$nameInput.val();if(existsName==name)return;if(parent_id&&name.length>0){existsName=name;$.get(ajaxURL+"exists?parent_id="+parent_id+"&name="+name,function(data){$status.html(" "+data).css("display","inline");if($(data).hasClass("taken")){$nameInput.addClass("ui-state-error-text");$dupNote.fadeIn("fast")}else{$nameInput.removeClass("ui-state-error-text");$dupNote.hide()}})}}$("#Inputfield_title, #Inputfield__pw_page_name").on("keyup",function(e){if(existsTimer)clearTimeout(existsTimer);existsTimer=setTimeout(function(){checkExists()},250)});if($(".langTabs").length){var $template=$("#template");$template.on("change",function(){var $option=$(this).find("option[value='"+$(this).val()+"']");if(parseInt($option.attr("data-nolang"))>0){hideLanguageTabs()}else{unhideLanguageTabs()}}).change();var noLang=$template.attr("data-nolang");if(typeof noLang!=="undefined"&&parseInt(noLang)>0){hideLanguageTabs()}}$(".InputfieldPageName .LanguageSupport input[type=text]").on("blur",function(){if($(this).val().length==0)return;var $checkbox=$(this).next("label").children("input");if(!$checkbox.is(":checked"))$checkbox.prop("checked",true)})}); \ No newline at end of file diff --git a/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.js b/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.js index 21a4dff6..5371339e 100644 --- a/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.js +++ b/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.js @@ -11,7 +11,7 @@ ProcessPageSearch = { $('#ProcessPageSearchLiveResults').load(ProcessWire.config.urls.admin + 'page/search/', { q: query }, function(data) { var numResults = parseInt($('#search_num_results').hide().text()); if(numResults) { - $('#search_results').fadeIn("fast").find("a").click(function() { + $('#search_results').fadeIn("fast").find("a").on('click', function() { // reduces time that horiz scrollbar shows in FF $("#search_results").css("overflow", "hidden"); }); @@ -34,18 +34,17 @@ ProcessPageSearch = { this.lastQuery = this.defaultLabel; $('#container').append('
'); - $('#search_form').unbind().submit(function() { + $('#search_form').off().on('submit', function() { return this.search(); }); - $('#search_query').attr('autocomplete', 'off').focus(function() { - $(this).keyup(function() { + $('#search_query').attr('autocomplete', 'off').on('focus', function() { + $(this).on('keyup', function() { if($(this).val().length < 4) return; if(this.t) clearTimeout(this.t); this.t = setTimeout("liveSearch.search()", 500); }); - - }).blur(function() { + }).on('blur', function() { setTimeout("liveSearch.hide()", 250); }); } diff --git a/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.min.js b/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.min.js index 98b6ea6a..012309b9 100644 --- a/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.min.js +++ b/wire/modules/Process/ProcessPageSearch/ProcessPageSearch.min.js @@ -1 +1 @@ -ProcessPageSearch={t:0,defaultLabel:"Search",lastQuery:"",search:function(){var query=$("#ProcessPageSearchQuery").val();if(query==this.lastQuery)return false;$("#ProcessPageSearchStatus").text("Searching");$("#ProcessPageSearchLiveResults").load(ProcessWire.config.urls.admin+"page/search/",{q:query},function(data){var numResults=parseInt($("#search_num_results").hide().text());if(numResults){$("#search_results").fadeIn("fast").find("a").click(function(){$("#search_results").css("overflow","hidden")});$("#search_status").text(numResults+" matches")}else{$("#search_status").text("No matches")}});this.lastQuery=query;return false},hide:function(){$("#search_results").fadeOut("fast",function(){$(this).remove()});$("#search_status").text("");$("#search_query").val(this.defaultLabel)},init:function(){this.lastQuery=this.defaultLabel;$("#container").append('
');$("#search_form").unbind().submit(function(){return this.search()});$("#search_query").attr("autocomplete","off").focus(function(){$(this).keyup(function(){if($(this).val().length<4)return;if(this.t)clearTimeout(this.t);this.t=setTimeout("liveSearch.search()",500)})}).blur(function(){setTimeout("liveSearch.hide()",250)})}};$(document).ready(function(){}); \ No newline at end of file +ProcessPageSearch={t:0,defaultLabel:"Search",lastQuery:"",search:function(){var query=$("#ProcessPageSearchQuery").val();if(query==this.lastQuery)return false;$("#ProcessPageSearchStatus").text("Searching");$("#ProcessPageSearchLiveResults").load(ProcessWire.config.urls.admin+"page/search/",{q:query},function(data){var numResults=parseInt($("#search_num_results").hide().text());if(numResults){$("#search_results").fadeIn("fast").find("a").on("click",function(){$("#search_results").css("overflow","hidden")});$("#search_status").text(numResults+" matches")}else{$("#search_status").text("No matches")}});this.lastQuery=query;return false},hide:function(){$("#search_results").fadeOut("fast",function(){$(this).remove()});$("#search_status").text("");$("#search_query").val(this.defaultLabel)},init:function(){this.lastQuery=this.defaultLabel;$("#container").append('
');$("#search_form").off().on("submit",function(){return this.search()});$("#search_query").attr("autocomplete","off").on("focus",function(){$(this).on("keyup",function(){if($(this).val().length<4)return;if(this.t)clearTimeout(this.t);this.t=setTimeout("liveSearch.search()",500)})}).on("blur",function(){setTimeout("liveSearch.hide()",250)})}};$(document).ready(function(){}); \ No newline at end of file diff --git a/wire/modules/Process/ProcessTemplate/ProcessTemplate.js b/wire/modules/Process/ProcessTemplate/ProcessTemplate.js index 97966769..0e3e5b89 100644 --- a/wire/modules/Process/ProcessTemplate/ProcessTemplate.js +++ b/wire/modules/Process/ProcessTemplate/ProcessTemplate.js @@ -389,8 +389,11 @@ function ProcessTemplate() { function setupAccessTab() { var redirectLoginClick = function() { - if($("#redirectLogin_-1:checked").length > 0) $("#wrap_redirectLoginURL").slideDown(); - else $("#wrap_redirectLoginURL").hide(); + if($("#redirectLogin_-1:checked").length > 0) { + $("#wrap_redirectLoginURL").slideDown(); + } else { + $("#wrap_redirectLoginURL").hide(); + } } var adjustAccessFields = function() { @@ -409,7 +412,6 @@ function ProcessTemplate() { } }); - // $("input.viewRoles").attr('checked', 'checked'); // JQM $('input.viewRoles').prop('checked', true); } else { @@ -419,7 +421,7 @@ function ProcessTemplate() { if($item.is(":visible")) return; $item.slideDown("fast", function() { if(!$item.is(".InputfieldStateCollapsed")) return; - $item.find(".InputfieldStateToggle").click(); + $item.find(".InputfieldStateToggle").trigger('click'); }); }); redirectLoginClick(); @@ -427,12 +429,11 @@ function ProcessTemplate() { }; - $("#wrap_useRoles input").click(function() { + $("#wrap_useRoles input").on('click', function() { if($("#useRoles_1:checked").length > 0) { $("#wrap_redirectLogin").hide(); $("#wrap_guestSearchable").hide(); $("#useRolesYes").slideDown(400, function(){ $(this).css('overflow','visible') }); - // $("#wrap_useRoles > label").click(); $("input.viewRoles").prop('checked', true); } else { $("#useRolesYes").slideUp(); @@ -446,8 +447,8 @@ function ProcessTemplate() { } - $("#roles_37").click(adjustAccessFields); - $("input.viewRoles:not(#roles_37)").click(function() { + $("#roles_37").on('click', adjustAccessFields); + $("input.viewRoles:not(#roles_37)").on('click', function() { // prevent unchecking 'view' for other roles when 'guest' role is checked var $t = $(this); if($("#roles_37").is(":checked")) return false; @@ -468,10 +469,8 @@ function ProcessTemplate() { if($t.is(":checked")) { numChecked++; - // $createRoles.removeAttr('disabled'); // JQM $createRoles.prop('disabled', false); } else { - // $createRoles.removeAttr('checked').attr('disabled', 'disabled'); // JQM $createRoles.prop('checked', false).prop('disabled', true); } }); @@ -496,13 +495,13 @@ function ProcessTemplate() { numChecked > 0 ? $("#wrap_noInherit").slideDown() : $("#wrap_noInherit").hide(); }; - $("#roles_editor input.editRoles").click(editRolesClick); - $("#roles_editor input.editRoles, #roles_editor input.addRoles").click(editOrAddClick); + $("#roles_editor input.editRoles").on('click', editRolesClick); + $("#roles_editor input.editRoles, #roles_editor input.addRoles").on('click', editOrAddClick); editRolesClick(); editOrAddClick(); - $("#wrap_redirectLogin input").click(redirectLoginClick); + $("#wrap_redirectLogin input").on('click', redirectLoginClick); adjustAccessFields(); redirectLoginClick(); @@ -513,9 +512,9 @@ function ProcessTemplate() { * */ function setupImportExport() { - $("#export_data").click(function() { $(this).select(); }); + $("#export_data").on('click', function() { $(this).select(); }); - $(".import_toggle input[type=radio]").change(function() { + $(".import_toggle input[type=radio]").on('change', function() { var $table = $(this).parents('p.import_toggle').next('table'); var $fieldset = $(this).closest('.InputfieldFieldset'); if($(this).is(":checked") && $(this).val() == 0) { @@ -525,7 +524,7 @@ function ProcessTemplate() { $table.show(); $fieldset.removeClass('ui-priority-secondary'); } - }).change(); + }).trigger('change'); $("#import_form table td:not(:first-child)").each(function() { var html = $(this).html(); @@ -544,11 +543,11 @@ function ProcessTemplate() { * */ function init() { - $("#wrap_filter_system input").click(function() { + $("#wrap_filter_system input").on('click', function() { $(this).parents("form").submit(); }); - $("#filter_field").change(function() { + $("#filter_field").on('change', function() { $(this).parents("form").submit(); }); @@ -567,7 +566,7 @@ function ProcessTemplate() { setupImportExport(); - $("#fieldgroup_fields").change(function() { + $("#fieldgroup_fields").on('change', function() { $("#_fieldgroup_fields_changed").val('changed'); }); } diff --git a/wire/modules/Process/ProcessTemplate/ProcessTemplate.min.js b/wire/modules/Process/ProcessTemplate/ProcessTemplate.min.js index 4613ca4c..12e866f1 100644 --- a/wire/modules/Process/ProcessTemplate/ProcessTemplate.min.js +++ b/wire/modules/Process/ProcessTemplate/ProcessTemplate.min.js @@ -1 +1 @@ -function ProcessTemplateAsmSelect(){function setupRows(){var $inputfield=$("#wrap_fieldgroup_fields");var $item=$inputfield.find(".asmListItem:eq(0)");var $lastItem=null;var lastItemWidth=0;var total=0;var numRows=0;do{$item.removeClass("rowItem rowStart rowStop rowError");var w=parseInt($item.find(".columnWidth").text());if(w===100){if(total>0&&total<100&&lastItemWidth>0&&lastItemWidth<100){$lastItem.addClass("rowError");if(!$lastItem.hasClass("rowStart"))$lastItem.addClass("rowStop")}total=0}else{if(!total){$item.addClass("rowStart");numRows++}$item.addClass("rowItem");if(total+w>100){if($lastItem&&lastItemWidth<100){if($lastItem.hasClass("rowStart")){$lastItem.addClass("rowError")}else{$lastItem.addClass("rowStop rowError")}}$item.addClass("rowStart");numRows++;total=w}else if(total+w==100){$item.addClass("rowStop");total=0}else{total+=w}}$lastItem=$item;lastItemWidth=w;$item=$item.next(".asmListItem")}while($item.length);if($lastItem.length&&lastItemWidth<100){$lastItem.addClass("rowStop");if(total>0&&total<100){$lastItem.addClass("rowError")}else{$lastItem.removeClass("rowError")}}return numRows}function setupColumnWidth(){var $percentElement=null;var currentPct=0;var lastPageX=0;var lastPageY=0;var mousingActive=false;var isDblClick=false;var snapWithin=9;var snapWidth=0;function asmListItem($item){if(!$item.hasClass("asmListItem"))$item=$item.closest(".asmListItem");return $item}function columnWidthItem($item){if($item.hasClass("columnWidth"))return $item;return $item.find(".columnWidth")}function getColumnWidth($item){$item=columnWidthItem($item);return parseInt($item.text())}function getSnapWidth($item){$item=asmListItem($item);var rowWidth=getRowWidth($item);var itemWidth=getColumnWidth($item);var snap;if(rowWidth==100){snap=itemWidth}else{snap=100-(rowWidth-itemWidth)}return snap}function getRowStartItem($item){$item=asmListItem($item);if(!$item.hasClass("rowItem")||$item.hasClass("rowStart"))return $item;var $prevItem=$item;do{$prevItem=$prevItem.prev(".rowItem")}while($prevItem.length&&!$prevItem.hasClass("rowStart"));return $prevItem.length?$prevItem:$item}function getRowStopItem($item){$item=asmListItem($item);if(!item.hasClass("rowItem")||$item.hasClass("rowStop"))return $item;var $nextItem=$item;do{$nextItem=$nextItem.next(".rowItem")}while($nextItem.length&&!$nextItem.hasClass("rowStop"));return $nextItem.length?$nextItem:$item}function getRowWidth($item){if(!$item.hasClass("rowItem"))return 100;$item=getRowStartItem($item);var total=getColumnWidth($item);var $nextItem=$item;var w=0;do{$nextItem=$nextItem.next(".rowItem");if(!$nextItem.length||$nextItem.hasClass("rowStart"))break;w=getColumnWidth($nextItem);if(total+w>100)break;total+=w}while(total<100&&!$nextItem.hasClass("rowStop"));return total}function setColumnWidth($item,columnWidth){var $parent;if($item.hasClass("columnWidth")){$parent=$item.closest(".asmListItem")}else{$parent=$item;$item=$item.find(".columnWidth")}if(snapWidth>0){if(columnWidth>snapWidth&&columnWidth-snapWidth<=snapWithin){columnWidth=snapWidth}else if(columnWidth=90){$columnWidthBarPct.text("")}else{$columnWidthBarPct.text(pct)}}function saveColumnWidth($item){var columnWidth=getColumnWidth($item);var $li=$item.hasClass("asmListItem")?$item:$item.closest(".asmListItem");var url="./saveProperty";var data={id:$("#Inputfield_id").val(),property:"columnWidth",columnWidth:columnWidth,field:parseInt($li.find(".columnWidth").attr("data-field"))};var $csrf=$("input._post_token");data[$csrf.attr("name")]=$csrf.val();$.post(url,data,function(result){if(result.success){if(result.value!=columnWidth)setColumnWidth($item,result.value)}},"json")}function startColumnWidthBar($item){if(!$item.hasClass("asmListItem"))$item=$item.closest(".asmListItem");if(isDblClick||!mousingActive)return;var $columnWidthBar=$item.find(".columnWidthBar");if($columnWidthBar.length)$columnWidthBar.remove();var pct=getColumnWidth($item)+"%";var $columnWidthBarPct=$("").addClass("columnWidthBarPct").text(pct);$columnWidthBar=$("
").addClass("columnWidthBar").append($columnWidthBarPct);$columnWidthBar.appendTo($item);$columnWidthBar.css("width",pct)}function stopColumnWidthBar($item){if(!$item.hasClass("asmListItem"))$item=$item.closest(".asmListItem");var $columnWidthBar=$item.find(".columnWidthBar");if(!$columnWidthBar.length)return;$columnWidthBar.remove()}function setActive($item,active){var $list=$item.closest(".ui-sortable");if(!$item.hasClass("columnWidth"))$item=$item.find(".columnWidth");var $parent=$item.closest(".asmListItem");if(active){if(mousingActive)return;mousingActive=true;$item.addClass("columnWidthActive");$("body").addClass("columnWidthActive");$item.siblings(".fieldType, .fieldInfo").css("opacity",.3);$list.sortable("disable");snapWidth=getSnapWidth($parent);startColumnWidthBar($item)}else{if(!mousingActive)return;mousingActive=false;stopColumnWidthBar($item);snapWidth=0;$item.removeClass("columnWidthActive");$("body").removeClass("columnWidthActive");$item.siblings(".fieldType, .fieldInfo").css("opacity",1);$list.sortable("enable")}}var mouseMove=function(e){if(lastPageX&&lastPageY){var diffX=e.pageX-lastPageX;var diffY=e.pageY-lastPageY;var diff=Math.abs(diffX)>=Math.abs(diffY)?diffX:diffY*-1;if(diff===0)return;var pct=currentPct;if(diff>0&&pct<100)pct++;if(diff<0&&pct>10)pct--;if(pct!=currentPct){setColumnWidth($percentElement,pct);currentPct=pct}}lastPageX=e.pageX;lastPageY=e.pageY};var mouseUp=function(){$(document).off("mouseup",mouseUp);$(document).off("mousemove",mouseMove);saveColumnWidth($percentElement);setActive($percentElement,false);setupRows()};var mouseDown=function(e){$percentElement=$(this);if($percentElement.hasClass("columnWidthOff"))return false;setActive($percentElement,true);currentPct=getColumnWidth($percentElement);$(document).on("mouseup",mouseUp);$(document).on("mousemove",mouseMove)};var mouseOut=function(e){if(mousingActive)return;$(this).closest(".ui-sortable").sortable("enable")};var mouseOver=function(e){if(mousingActive)return;$(this).closest(".ui-sortable").sortable("disable")};var dblClick=function(e){var $t=$(this);isDblClick=true;snapWidth=getSnapWidth($t);if(snapWidth){setColumnWidth($t,snapWidth);setupRows();saveColumnWidth($t)}isDblClick=false};var $inputfield=$("#wrap_fieldgroup_fields");var $select=$("#fieldgroup_fields");$inputfield.on("mousedown",".columnWidth",mouseDown).on("mouseover",".columnWidth",mouseOver).on("mouseout",".columnWidth",mouseOut).on("dblclick",".columnWidth",dblClick).on("asm-ready",function(){setupRows()});$select.on("change",function(e,eventData){if(typeof eventData=="undefined")return;if(typeof eventData.type=="undefined")return;if(eventData.type==="add")$inputfield.addClass("field-added");if(eventData.type!="sort")return;setupRows();var value=$(this).val();var url="./saveProperty";var data={id:$("#Inputfield_id").val(),property:"fieldgroup_fields",fieldgroup_fields:value,_fieldgroup_fields_changed:"changed"};var $csrf=$("input._post_token");data[$csrf.attr("name")]=$csrf.val();$.post(url,data,function(result){},"json")})}setupColumnWidth()}function ProcessTemplate(){function setupAccessTab(){var redirectLoginClick=function(){if($("#redirectLogin_-1:checked").length>0)$("#wrap_redirectLoginURL").slideDown();else $("#wrap_redirectLoginURL").hide()};var adjustAccessFields=function(){var items=["#wrap_redirectLogin","#wrap_guestSearchable"];if($("#roles_37").is(":checked")){$("#wrap_redirectLoginURL").hide();$(items).each(function(key,value){var $item=$(value);if($item.is(".InputfieldStateCollapsed")){$item.hide()}else{$item.slideUp()}});$("input.viewRoles").prop("checked",true)}else{$(items).each(function(key,value){var $item=$(value);if($item.is(":visible"))return;$item.slideDown("fast",function(){if(!$item.is(".InputfieldStateCollapsed"))return;$item.find(".InputfieldStateToggle").click()})});redirectLoginClick()}};$("#wrap_useRoles input").click(function(){if($("#useRoles_1:checked").length>0){$("#wrap_redirectLogin").hide();$("#wrap_guestSearchable").hide();$("#useRolesYes").slideDown(400,function(){$(this).css("overflow","visible")});$("input.viewRoles").prop("checked",true)}else{$("#useRolesYes").slideUp();$("#accessOverrides:visible").slideUp()}});if($("#useRoles_0:checked").length>0){$("#useRolesYes").hide();$("#accessOverrides").hide()}$("#roles_37").click(adjustAccessFields);$("input.viewRoles:not(#roles_37)").click(function(){var $t=$(this);if($("#roles_37").is(":checked"))return false;return true});var editRolesClick=function(){var $editRoles=$("#roles_editor input.editRoles");var numChecked=0;$editRoles.each(function(){var $t=$(this);if($t.is(":disabled"))return false;var $createRoles=$("input.createRoles[value="+$t.attr("value")+"]");if($t.is(":checked")){numChecked++;$createRoles.prop("disabled",false)}else{$createRoles.prop("checked",false).prop("disabled",true)}});if(numChecked){$("#accessOverrides").slideDown()}else{$("#accessOverrides").hide()}return true};var editOrAddClick=function(){var numChecked=0;$("#roles_editor input.editRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked"))numChecked++});$("#roles_editor input.addRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked"))numChecked++});numChecked>0?$("#wrap_noInherit").slideDown():$("#wrap_noInherit").hide()};$("#roles_editor input.editRoles").click(editRolesClick);$("#roles_editor input.editRoles, #roles_editor input.addRoles").click(editOrAddClick);editRolesClick();editOrAddClick();$("#wrap_redirectLogin input").click(redirectLoginClick);adjustAccessFields();redirectLoginClick()}function setupImportExport(){$("#export_data").click(function(){$(this).select()});$(".import_toggle input[type=radio]").change(function(){var $table=$(this).parents("p.import_toggle").next("table");var $fieldset=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){$table.hide();$fieldset.addClass("ui-priority-secondary")}else{$table.show();$fieldset.removeClass("ui-priority-secondary")}}).change();$("#import_form table td:not(:first-child)").each(function(){var html=$(this).html();var refresh=false;if(html.substring(0,1)=="{"){html="
"+html+"
";html=html.replace(/
/g,"");refresh=true}if(refresh)$(this).html(html)})}function init(){$("#wrap_filter_system input").click(function(){$(this).parents("form").submit()});$("#filter_field").change(function(){$(this).parents("form").submit()});setupAccessTab();var $templateEdit=$("#ProcessTemplateEdit");if($templateEdit.length>0){$templateEdit.find("script").remove();$templateEdit.WireTabs({items:$(".Inputfields li.WireTab"),id:"TemplateEditTabs",skipRememberTabIDs:["WireTabDelete"]})}setupImportExport();$("#fieldgroup_fields").change(function(){$("#_fieldgroup_fields_changed").val("changed")})}init()}function ProcessTemplateInitFields(){$("#wrap_fieldgroup_fields").trigger("asm-ready")}$(document).ready(function(){ProcessTemplate();ProcessTemplateAsmSelect()}); \ No newline at end of file +function ProcessTemplateAsmSelect(){function setupRows(){var $inputfield=$("#wrap_fieldgroup_fields");var $item=$inputfield.find(".asmListItem:eq(0)");var $lastItem=null;var lastItemWidth=0;var total=0;var numRows=0;do{$item.removeClass("rowItem rowStart rowStop rowError");var w=parseInt($item.find(".columnWidth").text());if(w===100){if(total>0&&total<100&&lastItemWidth>0&&lastItemWidth<100){$lastItem.addClass("rowError");if(!$lastItem.hasClass("rowStart"))$lastItem.addClass("rowStop")}total=0}else{if(!total){$item.addClass("rowStart");numRows++}$item.addClass("rowItem");if(total+w>100){if($lastItem&&lastItemWidth<100){if($lastItem.hasClass("rowStart")){$lastItem.addClass("rowError")}else{$lastItem.addClass("rowStop rowError")}}$item.addClass("rowStart");numRows++;total=w}else if(total+w==100){$item.addClass("rowStop");total=0}else{total+=w}}$lastItem=$item;lastItemWidth=w;$item=$item.next(".asmListItem")}while($item.length);if($lastItem.length&&lastItemWidth<100){$lastItem.addClass("rowStop");if(total>0&&total<100){$lastItem.addClass("rowError")}else{$lastItem.removeClass("rowError")}}return numRows}function setupColumnWidth(){var $percentElement=null;var currentPct=0;var lastPageX=0;var lastPageY=0;var mousingActive=false;var isDblClick=false;var snapWithin=9;var snapWidth=0;function asmListItem($item){if(!$item.hasClass("asmListItem"))$item=$item.closest(".asmListItem");return $item}function columnWidthItem($item){if($item.hasClass("columnWidth"))return $item;return $item.find(".columnWidth")}function getColumnWidth($item){$item=columnWidthItem($item);return parseInt($item.text())}function getSnapWidth($item){$item=asmListItem($item);var rowWidth=getRowWidth($item);var itemWidth=getColumnWidth($item);var snap;if(rowWidth==100){snap=itemWidth}else{snap=100-(rowWidth-itemWidth)}return snap}function getRowStartItem($item){$item=asmListItem($item);if(!$item.hasClass("rowItem")||$item.hasClass("rowStart"))return $item;var $prevItem=$item;do{$prevItem=$prevItem.prev(".rowItem")}while($prevItem.length&&!$prevItem.hasClass("rowStart"));return $prevItem.length?$prevItem:$item}function getRowStopItem($item){$item=asmListItem($item);if(!item.hasClass("rowItem")||$item.hasClass("rowStop"))return $item;var $nextItem=$item;do{$nextItem=$nextItem.next(".rowItem")}while($nextItem.length&&!$nextItem.hasClass("rowStop"));return $nextItem.length?$nextItem:$item}function getRowWidth($item){if(!$item.hasClass("rowItem"))return 100;$item=getRowStartItem($item);var total=getColumnWidth($item);var $nextItem=$item;var w=0;do{$nextItem=$nextItem.next(".rowItem");if(!$nextItem.length||$nextItem.hasClass("rowStart"))break;w=getColumnWidth($nextItem);if(total+w>100)break;total+=w}while(total<100&&!$nextItem.hasClass("rowStop"));return total}function setColumnWidth($item,columnWidth){var $parent;if($item.hasClass("columnWidth")){$parent=$item.closest(".asmListItem")}else{$parent=$item;$item=$item.find(".columnWidth")}if(snapWidth>0){if(columnWidth>snapWidth&&columnWidth-snapWidth<=snapWithin){columnWidth=snapWidth}else if(columnWidth=90){$columnWidthBarPct.text("")}else{$columnWidthBarPct.text(pct)}}function saveColumnWidth($item){var columnWidth=getColumnWidth($item);var $li=$item.hasClass("asmListItem")?$item:$item.closest(".asmListItem");var url="./saveProperty";var data={id:$("#Inputfield_id").val(),property:"columnWidth",columnWidth:columnWidth,field:parseInt($li.find(".columnWidth").attr("data-field"))};var $csrf=$("input._post_token");data[$csrf.attr("name")]=$csrf.val();$.post(url,data,function(result){if(result.success){if(result.value!=columnWidth)setColumnWidth($item,result.value)}},"json")}function startColumnWidthBar($item){if(!$item.hasClass("asmListItem"))$item=$item.closest(".asmListItem");if(isDblClick||!mousingActive)return;var $columnWidthBar=$item.find(".columnWidthBar");if($columnWidthBar.length)$columnWidthBar.remove();var pct=getColumnWidth($item)+"%";var $columnWidthBarPct=$("").addClass("columnWidthBarPct").text(pct);$columnWidthBar=$("
").addClass("columnWidthBar").append($columnWidthBarPct);$columnWidthBar.appendTo($item);$columnWidthBar.css("width",pct)}function stopColumnWidthBar($item){if(!$item.hasClass("asmListItem"))$item=$item.closest(".asmListItem");var $columnWidthBar=$item.find(".columnWidthBar");if(!$columnWidthBar.length)return;$columnWidthBar.remove()}function setActive($item,active){var $list=$item.closest(".ui-sortable");if(!$item.hasClass("columnWidth"))$item=$item.find(".columnWidth");var $parent=$item.closest(".asmListItem");if(active){if(mousingActive)return;mousingActive=true;$item.addClass("columnWidthActive");$("body").addClass("columnWidthActive");$item.siblings(".fieldType, .fieldInfo").css("opacity",.3);$list.sortable("disable");snapWidth=getSnapWidth($parent);startColumnWidthBar($item)}else{if(!mousingActive)return;mousingActive=false;stopColumnWidthBar($item);snapWidth=0;$item.removeClass("columnWidthActive");$("body").removeClass("columnWidthActive");$item.siblings(".fieldType, .fieldInfo").css("opacity",1);$list.sortable("enable")}}var mouseMove=function(e){if(lastPageX&&lastPageY){var diffX=e.pageX-lastPageX;var diffY=e.pageY-lastPageY;var diff=Math.abs(diffX)>=Math.abs(diffY)?diffX:diffY*-1;if(diff===0)return;var pct=currentPct;if(diff>0&&pct<100)pct++;if(diff<0&&pct>10)pct--;if(pct!=currentPct){setColumnWidth($percentElement,pct);currentPct=pct}}lastPageX=e.pageX;lastPageY=e.pageY};var mouseUp=function(){$(document).off("mouseup",mouseUp);$(document).off("mousemove",mouseMove);saveColumnWidth($percentElement);setActive($percentElement,false);setupRows()};var mouseDown=function(e){$percentElement=$(this);if($percentElement.hasClass("columnWidthOff"))return false;setActive($percentElement,true);currentPct=getColumnWidth($percentElement);$(document).on("mouseup",mouseUp);$(document).on("mousemove",mouseMove)};var mouseOut=function(e){if(mousingActive)return;$(this).closest(".ui-sortable").sortable("enable")};var mouseOver=function(e){if(mousingActive)return;$(this).closest(".ui-sortable").sortable("disable")};var dblClick=function(e){var $t=$(this);isDblClick=true;snapWidth=getSnapWidth($t);if(snapWidth){setColumnWidth($t,snapWidth);setupRows();saveColumnWidth($t)}isDblClick=false};var $inputfield=$("#wrap_fieldgroup_fields");var $select=$("#fieldgroup_fields");$inputfield.on("mousedown",".columnWidth",mouseDown).on("mouseover",".columnWidth",mouseOver).on("mouseout",".columnWidth",mouseOut).on("dblclick",".columnWidth",dblClick).on("asm-ready",function(){setupRows()});$select.on("change",function(e,eventData){if(typeof eventData=="undefined")return;if(typeof eventData.type=="undefined")return;if(eventData.type==="add")$inputfield.addClass("field-added");if(eventData.type!="sort")return;setupRows();var value=$(this).val();var url="./saveProperty";var data={id:$("#Inputfield_id").val(),property:"fieldgroup_fields",fieldgroup_fields:value,_fieldgroup_fields_changed:"changed"};var $csrf=$("input._post_token");data[$csrf.attr("name")]=$csrf.val();$.post(url,data,function(result){},"json")})}setupColumnWidth()}function ProcessTemplate(){function setupAccessTab(){var redirectLoginClick=function(){if($("#redirectLogin_-1:checked").length>0){$("#wrap_redirectLoginURL").slideDown()}else{$("#wrap_redirectLoginURL").hide()}};var adjustAccessFields=function(){var items=["#wrap_redirectLogin","#wrap_guestSearchable"];if($("#roles_37").is(":checked")){$("#wrap_redirectLoginURL").hide();$(items).each(function(key,value){var $item=$(value);if($item.is(".InputfieldStateCollapsed")){$item.hide()}else{$item.slideUp()}});$("input.viewRoles").prop("checked",true)}else{$(items).each(function(key,value){var $item=$(value);if($item.is(":visible"))return;$item.slideDown("fast",function(){if(!$item.is(".InputfieldStateCollapsed"))return;$item.find(".InputfieldStateToggle").trigger("click")})});redirectLoginClick()}};$("#wrap_useRoles input").on("click",function(){if($("#useRoles_1:checked").length>0){$("#wrap_redirectLogin").hide();$("#wrap_guestSearchable").hide();$("#useRolesYes").slideDown(400,function(){$(this).css("overflow","visible")});$("input.viewRoles").prop("checked",true)}else{$("#useRolesYes").slideUp();$("#accessOverrides:visible").slideUp()}});if($("#useRoles_0:checked").length>0){$("#useRolesYes").hide();$("#accessOverrides").hide()}$("#roles_37").on("click",adjustAccessFields);$("input.viewRoles:not(#roles_37)").on("click",function(){var $t=$(this);if($("#roles_37").is(":checked"))return false;return true});var editRolesClick=function(){var $editRoles=$("#roles_editor input.editRoles");var numChecked=0;$editRoles.each(function(){var $t=$(this);if($t.is(":disabled"))return false;var $createRoles=$("input.createRoles[value="+$t.attr("value")+"]");if($t.is(":checked")){numChecked++;$createRoles.prop("disabled",false)}else{$createRoles.prop("checked",false).prop("disabled",true)}});if(numChecked){$("#accessOverrides").slideDown()}else{$("#accessOverrides").hide()}return true};var editOrAddClick=function(){var numChecked=0;$("#roles_editor input.editRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked"))numChecked++});$("#roles_editor input.addRoles").each(function(){if(!$(this).is(":disabled")&&$(this).is(":checked"))numChecked++});numChecked>0?$("#wrap_noInherit").slideDown():$("#wrap_noInherit").hide()};$("#roles_editor input.editRoles").on("click",editRolesClick);$("#roles_editor input.editRoles, #roles_editor input.addRoles").on("click",editOrAddClick);editRolesClick();editOrAddClick();$("#wrap_redirectLogin input").on("click",redirectLoginClick);adjustAccessFields();redirectLoginClick()}function setupImportExport(){$("#export_data").on("click",function(){$(this).select()});$(".import_toggle input[type=radio]").on("change",function(){var $table=$(this).parents("p.import_toggle").next("table");var $fieldset=$(this).closest(".InputfieldFieldset");if($(this).is(":checked")&&$(this).val()==0){$table.hide();$fieldset.addClass("ui-priority-secondary")}else{$table.show();$fieldset.removeClass("ui-priority-secondary")}}).trigger("change");$("#import_form table td:not(:first-child)").each(function(){var html=$(this).html();var refresh=false;if(html.substring(0,1)=="{"){html="
"+html+"
";html=html.replace(/
/g,"");refresh=true}if(refresh)$(this).html(html)})}function init(){$("#wrap_filter_system input").on("click",function(){$(this).parents("form").submit()});$("#filter_field").on("change",function(){$(this).parents("form").submit()});setupAccessTab();var $templateEdit=$("#ProcessTemplateEdit");if($templateEdit.length>0){$templateEdit.find("script").remove();$templateEdit.WireTabs({items:$(".Inputfields li.WireTab"),id:"TemplateEditTabs",skipRememberTabIDs:["WireTabDelete"]})}setupImportExport();$("#fieldgroup_fields").on("change",function(){$("#_fieldgroup_fields_changed").val("changed")})}init()}function ProcessTemplateInitFields(){$("#wrap_fieldgroup_fields").trigger("asm-ready")}$(document).ready(function(){ProcessTemplate();ProcessTemplateAsmSelect()}); \ No newline at end of file diff --git a/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.js b/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.js index c732aecd..07738f58 100755 --- a/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.js +++ b/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.js @@ -5,7 +5,7 @@ function TemplateFieldAddDialog() { var fieldReady = false; var $iframe = pwModalWindow($a.attr('href'), {}, 'large'); - $iframe.load(function() { + $iframe.on('load', function() { var $button; var buttons = []; @@ -29,7 +29,7 @@ function TemplateFieldAddDialog() { 'text': text, 'class': ($button.hasClass('ui-priority-secondary') ? 'ui-priority-secondary' : ''), 'click': function() { - $button.click(); + $button.trigger('click'); fieldReady = true; } }; @@ -80,5 +80,5 @@ function TemplateFieldAddDialog() { $(document).ready(function() { - $('#wrap_fieldgroup_fields p.description a').click(TemplateFieldAddDialog); -}); \ No newline at end of file + $('#wrap_fieldgroup_fields p.description a').on('click', TemplateFieldAddDialog); +}); diff --git a/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.min.js b/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.min.js index 5f554387..6386150e 100644 --- a/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.min.js +++ b/wire/modules/Process/ProcessTemplate/ProcessTemplateFieldCreator.min.js @@ -1 +1 @@ -function TemplateFieldAddDialog(){var b=$(this);var a=false;var c=pwModalWindow(b.attr("href"),{},"large");c.load(function(){var e;var d=[];var f=c.contents();var g=0;f.find("#breadcrumbs ul.nav, #Inputfield_submit_save_field_copy").hide();f.find("#content form button.ui-button[type=submit]").each(function(){var k=$(this).text();var j=false;e=$(this);for(var h=0;h").val(j).text(f.find("#Inputfield_name").val()));$('#fieldgroup_fields option[value="'+j+'"]').attr("id","asm0option"+i).attr("data-desc",(f.find("#field_label").val())).attr("data-status",(f.find("#Inputfield_type option:selected").text()));$("#asmSelect0 option").eq(1).before($("").val(j).text(f.find("#Inputfield_name").val()));$("#asmSelect0").find("option:selected").removeAttr("selected");$('#asmSelect0 option[value="'+j+'"]').attr("rel","asm0option"+i).attr("selected","selected").addClass("asmOptionDisabled").attr("disabled","disabled").trigger("change").removeAttr("selected")},500)}}}c.setButtons(d)});return false}$(document).ready(function(){$("#wrap_fieldgroup_fields p.description a").click(TemplateFieldAddDialog)}); \ No newline at end of file +function TemplateFieldAddDialog(){var $a=$(this);var fieldReady=false;var $iframe=pwModalWindow($a.attr("href"),{},"large");$iframe.on("load",function(){var $button;var buttons=[];var $icontents=$iframe.contents();var n=0;$icontents.find("#breadcrumbs ul.nav, #Inputfield_submit_save_field_copy").hide();$icontents.find("#content form button.ui-button[type=submit]").each(function(){var text=$(this).text();var skip=false;$button=$(this);for(var i=0;i").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($("").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)});return false}$(document).ready(function(){$("#wrap_fieldgroup_fields p.description a").on("click",TemplateFieldAddDialog)}); \ No newline at end of file