From 3c8a318733433a56dd15ca8732b03993235d1cec Mon Sep 17 00:00:00 2001 From: Zach Erkkila Date: Fri, 18 Aug 2017 14:50:29 -0400 Subject: [PATCH 1/2] Abort previous table reload on subsequent reload call --- .DS_Store | Bin 0 -> 6148 bytes MVCGrid/.DS_Store | Bin 0 -> 6148 bytes MVCGrid/Scripts/MVCGrid.js | 8 +++++++- MVCGridExample/.DS_Store | Bin 0 -> 6148 bytes 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 MVCGrid/.DS_Store create mode 100644 MVCGridExample/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a78a4d00264e407b3e13d5bc55c3c16e22dea686 GIT binary patch literal 6148 zcmeH~%}T^T5QJ-V!G#6cqsMs#-yp2Jc=9B8_9qHLB;q1?%+1%f`bXK2c=aIF&{LV7 z?iunO(is3{^WL5VYXD2SDL!qOnys5p>?k9q#rJr_Guo$i|8U<=vgZRMLKsDC;*_!WS**Z46;r(xb7HOd>>#h&GuNBcA=Jwm_j0O!1dNMJ1pb1+7pzen(*OVf literal 0 HcmV?d00001 diff --git a/MVCGrid/.DS_Store b/MVCGrid/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4d4fd844021559b8d187a1e14812fb72587bcfeb GIT binary patch literal 6148 zcmeHKOKL(v5Ufsw2-&#Ia;}gY3}Q~;1w=&%1Pn3Rzm@08(Ng_cL|)wK!cYx8HPh2I z!_?ySYXCO?+CBp_08_dnjy{ad_uWT!R}mx9dB!_FaoBASoArK_{dd5*4_IP@54`^7 z@85h&CIzH`6p#W^Knh$~fhw@m#|xjULj3PX~u+0f-ZZ!#Iy# zg4jGj?1e)jBQ#4YF{xH9h9#ZxR(ZW}NK87cnh&d+tvVEo+j)MAbXZT+C}^3Wq4i#3;vHcsYKG cq|9qR=YB675`)fo(24pPa9w0l;MxlO08C^Rk^lez literal 0 HcmV?d00001 diff --git a/MVCGrid/Scripts/MVCGrid.js b/MVCGrid/Scripts/MVCGrid.js index fe0b114..384655f 100644 --- a/MVCGrid/Scripts/MVCGrid.js +++ b/MVCGrid/Scripts/MVCGrid.js @@ -5,6 +5,7 @@ var MVCGrid = new function () { var controllerPath = '%%CONTROLLERPATH%%'; var showErrorDetails = %%ERRORDETAILS%%; var currentGrids = []; + var currentRequest; // public this.init = function () { @@ -417,12 +418,17 @@ var MVCGrid = new function () { fullAjaxUrl = updateURLParameter(fullAjaxUrl, thisPP, v); }); - $.ajax({ + currentRequest = $.ajax({ type: "GET", url: fullAjaxUrl, data: { 'Name': mvcGridName }, cache: false, beforeSend: function () { + if(currentRequest != null) + { + currentRequest.abort(); + } + if (gridDef.clientLoading != '') { window[gridDef.clientLoading](); } diff --git a/MVCGridExample/.DS_Store b/MVCGridExample/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..69fd51056a1608a6da747aebe95955fb47f7a80e GIT binary patch literal 6148 zcmeHKOKL(v5Uh?uglt@9IakOH1~Dh_0-_QS0*09E-^z34XsP}nk!M!HO{j+Mn(5c| zhN;Et*8ptsxqAZU0A_SYoIH%ppSzFjt};fX^Br&a!0}~w+-?q|>gx&T-eZL=-m(A5 zKfGQiC@Te|fE17dQa}p)NdfP@wAn+Vq7;w zC5X)v#9lZgGDEYZ5|e5*Vp!6dZ&lX|hs31AYWT1^*=j Date: Fri, 18 Aug 2017 15:12:41 -0400 Subject: [PATCH 2/2] Removed binary files --- .DS_Store | Bin 6148 -> 0 bytes MVCGrid/.DS_Store | Bin 6148 -> 0 bytes MVCGridExample/.DS_Store | Bin 6148 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 MVCGrid/.DS_Store delete mode 100644 MVCGridExample/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a78a4d00264e407b3e13d5bc55c3c16e22dea686..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~%}T^T5QJ-V!G#6cqsMs#-yp2Jc=9B8_9qHLB;q1?%+1%f`bXK2c=aIF&{LV7 z?iunO(is3{^WL5VYXD2SDL!qOnys5p>?k9q#rJr_Guo$i|8U<=vgZRMLKsDC;*_!WS**Z46;r(xb7HOd>>#h&GuNBcA=Jwm_j0O!1dNMJ1pb1+7pzen(*OVf diff --git a/MVCGrid/.DS_Store b/MVCGrid/.DS_Store deleted file mode 100644 index 4d4fd844021559b8d187a1e14812fb72587bcfeb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOKL(v5Ufsw2-&#Ia;}gY3}Q~;1w=&%1Pn3Rzm@08(Ng_cL|)wK!cYx8HPh2I z!_?ySYXCO?+CBp_08_dnjy{ad_uWT!R}mx9dB!_FaoBASoArK_{dd5*4_IP@54`^7 z@85h&CIzH`6p#W^Knh$~fhw@m#|xjULj3PX~u+0f-ZZ!#Iy# zg4jGj?1e)jBQ#4YF{xH9h9#ZxR(ZW}NK87cnh&d+tvVEo+j)MAbXZT+C}^3Wq4i#3;vHcsYKG cq|9qR=YB675`)fo(24pPa9w0l;MxlO08C^Rk^lez diff --git a/MVCGridExample/.DS_Store b/MVCGridExample/.DS_Store deleted file mode 100644 index 69fd51056a1608a6da747aebe95955fb47f7a80e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOKL(v5Uh?uglt@9IakOH1~Dh_0-_QS0*09E-^z34XsP}nk!M!HO{j+Mn(5c| zhN;Et*8ptsxqAZU0A_SYoIH%ppSzFjt};fX^Br&a!0}~w+-?q|>gx&T-eZL=-m(A5 zKfGQiC@Te|fE17dQa}p)NdfP@wAn+Vq7;w zC5X)v#9lZgGDEYZ5|e5*Vp!6dZ&lX|hs31AYWT1^*=j