diff --git a/wire/modules/Process/ProcessPageLister/ProcessPageLister.js b/wire/modules/Process/ProcessPageLister/ProcessPageLister.js index f830973b..4e66ee94 100644 --- a/wire/modules/Process/ProcessPageLister/ProcessPageLister.js +++ b/wire/modules/Process/ProcessPageLister/ProcessPageLister.js @@ -168,7 +168,7 @@ var ProcessLister = { ProcessLister.spinner.fadeIn('fast'); var submitData = { - filters: refreshAll ? ProcessLister.filters.val() : '', + filters: refreshAll ? ProcessLister.filters.val() : 'ignore', columns: $('#lister_columns').val(), sort: $('#lister_sort').val() }; @@ -185,7 +185,9 @@ var ProcessLister = { } if(ProcessLister.refreshRowPageIDs.length > 0) { - submitData['row_page_id'] = ProcessLister.refreshRowPageIDs.join(','); + var rowPageIDs = ProcessLister.refreshRowPageIDs.join(','); + if(rowPageIDs.indexOf(',') === 0) rowPageIDs = rowPageIDs.replace(/^,+/, ''); // ltrim + submitData['row_page_id'] = rowPageIDs; ProcessLister.resetTotal = false; } diff --git a/wire/modules/Process/ProcessPageLister/ProcessPageLister.min.js b/wire/modules/Process/ProcessPageLister/ProcessPageLister.min.js index 39741240..1eaed82f 100644 --- a/wire/modules/Process/ProcessPageLister/ProcessPageLister.min.js +++ b/wire/modules/Process/ProcessPageLister/ProcessPageLister.min.js @@ -1 +1 @@ -var ProcessLister={inInit:true,inTimeout:false,spinner:null,numSubmits:0,results:null,filters:null,lister:null,initialized:false,resetTotal:false,clickAfterRefresh:"",refreshRowPageIDs:[],extraSubmitData:{},init:function(){if(ProcessLister.initialized)return;ProcessLister.initialized=true;if($("#ProcessLister").length==0)return;ProcessLister.initSpinners();ProcessLister.filters=$("#ProcessListerFilters");ProcessLister.results=$("#ProcessListerResults");ProcessLister.lister=$("#ProcessLister");ProcessLister.filters.change(function(){ProcessLister.submit()});ProcessLister.results.on("click",".ProcessListerTable > thead th",ProcessLister.columnSort);$(document).on("click","a.actions_toggle",ProcessLister.pageClick);$(document).on("click",".actions a.ajax",ProcessLister.actionClickAjax);$("#actions_items_open").attr("disabled","disabled").parent("label").addClass("ui-state-disabled");$(document).on("click",".MarkupPagerNav a",function(){var url=$(this).attr("href");ProcessLister.submit(url);return false});$("#submit_refresh").click(function(){ProcessLister.resetTotal=true;ProcessLister.submit();$(this).fadeOut("normal",function(){$("#submit_refresh").removeClass("ui-state-active").fadeIn()});return false});$("#lister_columns").change(function(){ProcessLister.submit()});$("#ProcessListerActionsForm").find("script").remove();if(ProcessLister.lister.size()>0)ProcessLister.lister.WireTabs({items:$(".WireTab")});$("#_ProcessListerRefreshTab").html("").unbind("click").click(function(){ProcessLister.resetTotal=true;ProcessLister.submit();return false});$("#_ProcessListerResetTab").html("").unbind("click").click(function(){window.location.href="./?reset=1";return false});ProcessLister.inInit=false;if(ProcessLister.numSubmits==0)ProcessLister.submit();else ProcessLister.spinner.fadeOut()},initSpinners:function(){var $parent=$("#breadcrumbs ul.nav");if($parent.length){ProcessLister.spinner=$("
Error retrieving results: "+error+"
")}})},_submitSuccess:function(data){var refreshAll=true;if(ProcessLister.refreshRowPageIDs.length){refreshAll=false;for(var n in ProcessLister.refreshRowPageIDs){var pageID=ProcessLister.refreshRowPageIDs[n];var idAttr="#page"+pageID;var $oldRow=$(idAttr).closest("tr");var $newRow=$(data).find(idAttr).closest("tr");var message=$oldRow.find(".actions_toggle").attr("data-message");if($oldRow.length&&$newRow.length){$oldRow.replaceWith($newRow);$newRow.addClass("row_refreshed_"+pageID);$newRow.effect("highlight","normal");if(message){var $message=$(" ");$newRow.find(".actions_toggle").addClass("row_message_on").closest(".col_preview, td").append($message);setTimeout(function(){$message.fadeOut("normal",function(){$newRow.find(".actions_toggle").removeClass("row_message_on").click()})},1e3)}if($newRow.find(".Inputfield").length)InputfieldsInit($newRow)}else if($oldRow.length&&!$newRow.length){$oldRow.remove()}}ProcessLister.refreshRowPageIDs=[]}else{ProcessLister.results.fadeTo(0,0);var sort=$("#lister_sort").val();ProcessLister.results.html(data).find("table.ProcessListerTable > thead th").each(function(){var $b=$(this).find("b");var txt=$b.text();$b.remove();$(this).find("span").remove();var $icon=$(this).find("i");if($icon.length)$icon.remove();var label=$(this).html();if(txt==sort){$(this).html(""+label+" ↓"+txt+"")}else if(sort=="-"+txt){$(this).html(""+label+" ↑"+txt+"")}else{$(this).html(label+""+txt+"")}if($icon.length>0)$(this).prepend($icon)}).end().effect("highlight","fast");if(ProcessLister.results.find(".Inputfield").length){InputfieldsInit(ProcessLister.results)}}if(ProcessLister.clickAfterRefresh.length>0){if(ProcessLister.clickAfterRefresh.indexOf("#")<0&&ProcessLister.clickAfterRefresh.indexOf(".")<0){ProcessLister.clickAfterRefresh="#"+ProcessLister.clickAfterRefresh}$(ProcessLister.clickAfterRefresh).each(function(){var $a=$(this);$a.click();var $tr=$a.closest("tr");$tr.fadeTo(100,.1);setTimeout(function(){$tr.fadeTo(250,1)},250)});ProcessLister.clickAfterRefresh=""}ProcessLister.spinner.fadeOut();setTimeout(function(){ProcessLister.results.trigger("loaded");ProcessLister.results.find(".Inputfield:not(.reloaded)").addClass("reloaded").trigger("reloaded",["ProcessPageLister"]);$("a.actions_toggle.open").click().removeClass("open");if(typeof AdminDataTable!="undefined")AdminDataTable.init();$("a.lister-lightbox",ProcessLister.results).magnificPopup({type:"image",closeOnContentClick:true,closeBtnInside:true});if(refreshAll)ProcessLister.results.fadeTo(0,1)},250);var pos=data.indexOf("ProcessListerScript");if(pos){var js=data.substring(pos+21);if(js!=""){pos=js.indexOf("");js=js.substring(0,pos);$("body").append("