@ntlab/ntjs-assets 2.0.26 → 2.0.27

package/assets/js/cdn.json

@@ -157,7 +157,7 @@
     "cdnjs": "blueimp-JavaScript-Templates"
   },
   "jqGrid": {
-    "version": "5.8.7",
+    "version": "5.8.8",
     "cdnjs": "jqgrid"
   },
   "jquery": {

package/assets/js/jqGrid/css/ui.jqgrid-bootstrap5.css

@@ -405,7 +405,8 @@ div.tablediv > .table-bordered {
 .ui-jqgrid .ui-jqgrid-toppager .ui-pg-input { 
 	display: inline-block;
 	height:auto;
-	width: 50px;
+	width: auto;
+        max-width: 50px;
 	font-size: inherit; 
 	margin:0;
 	line-height: inherit;
@@ -1318,5 +1319,8 @@ a.colmenu .colmenuspan
 	overflow: auto;
 	height: 17em;
 }
+.frozen-bdiv [class*="ghead_"] td {
+    overflow-x: hidden;
+}
 /*uncomment  this if you use ie11*/
 /* <script>window.MSInputMethodContext && document.documentMode && document.write('<script src="https://cdn.jsdelivr.net/gh/nuxodin/ie11CustomProperties@4.1.0/ie11CustomProperties.min.js"><\/script>');</script>*/

package/assets/js/jqGrid/js/grid.base.js

@@ -19,7 +19,7 @@ if(!$.jgrid.hasOwnProperty("defaults")) {
 	$.jgrid.defaults = {};
 }
 $.extend($.jgrid,{
-	version : "5.8.7",
+	version : "5.8.8",
 	isNull : function( p, strict_eq) {
 		if(strict_eq && strict_eq === true) {
 			return p === null;
@@ -4065,10 +4065,12 @@ $.fn.jqGrid = function( pin ) {
 						prm[pN.sort] = gs;
 						prm[pN.order] = "";
 					}
+					/*
 					if(ts.p.datatype==='local' && !grp._locgr) {
 						ts.p.datatype = 'jsonstring';
 						ts.p.datastr = ts.p.data;
 					}
+					*/
 				}
 				$.extend(ts.p.postData,prm);
 				var rcnt = !ts.p.scroll ? 1 : ts.rows.length-1;
@@ -4161,10 +4163,12 @@ $.fn.jqGrid = function( pin ) {
 						return;
 					}
 					addJSONData(dstr);
+					/*
 					if(ts.p.grouping && ts.p.groupingView._locgr) {
 						// back to original data???
 						ts.p.data = dstr;
 					}
+					*/
 					afterprocess(dstr, lcf);
 				break;
 				case "local":
@@ -4670,6 +4674,9 @@ $.fn.jqGrid = function( pin ) {
 				if(ts.p.tblwidth > ts.p.width) {
 					ts.p.colModel[lvc].width -= (ts.p.tblwidth - parseInt(ts.p.width,10));
 					ts.p.tblwidth = ts.p.width;
+				} else if(!hs && ts.p.tblwidth === ts.p.width) {
+					ts.p.colModel[lvc].width -= bstw;
+					ts.p.tblwidth -= bstw;
 				}
 			}
 		},

package/assets/js/jqGrid/js/grid.formedit.js

@@ -1857,15 +1857,15 @@ $.jgrid.extend({
 			}
 			var alert_info = function(){
 				 $.jgrid.info_dialog(o.alertcap,"<div>"+o.alerttext+"</div><span tabindex='0'><span tabindex='-1' id='jqg_alrt'></span></span>","",{
-						jqModal:true,
-						drag:true,
-						resize:true,
-						caption:o.alertcap,
+					jqModal:true,
+					drag:true,
+					resize:true,
+					caption:o.alertcap,
 					width:o.alertwidth,
 					height: o.alertheight,
-						top:o.alerttop,
-						left:o.alertleft,
-						closeOnEscape:o.closeOnEscape, 
+					top:o.alerttop,
+					left:o.alertleft,
+					closeOnEscape:o.closeOnEscape, 
 					styleUI: $t.p.styleUI,
 					zIndex: o.alertzIndex}
 				);

package/assets/js/jqGrid/js/grid.grouping.js

@@ -214,7 +214,7 @@ $.jgrid.extend({
 						}
 						footLevel = parseInt($(r).attr("jqfootlevel") ,10);
 						skip = isNaN(footLevel) ? false : 
-						 (grp.showSummaryOnHide && footLevel >= num);
+						 (grp.showSummaryOnHide && footLevel <= num);
 						if( !skip) {
 							$(r).hide();
 						}

package/assets/js/jqGrid/js/jquery.jqGrid.js

@@ -1,6 +1,6 @@
 /**
 *
-* @license Guriddo jqGrid JS - v5.8.7 - 2024-06-01
+* @license Guriddo jqGrid JS - v5.8.8 - 2024-06-28
 * Copyright(c) 2008, Tony Tomov, tony@trirand.com
 * 
 * License: http://guriddo.net/?page_id=103334
@@ -24,7 +24,7 @@ if(!$.jgrid.hasOwnProperty("defaults")) {
 	$.jgrid.defaults = {};
 }
 $.extend($.jgrid,{
-	version : "5.8.7",
+	version : "5.8.8",
 	isNull : function( p, strict_eq) {
 		if(strict_eq && strict_eq === true) {
 			return p === null;
@@ -4070,10 +4070,12 @@ $.fn.jqGrid = function( pin ) {
 						prm[pN.sort] = gs;
 						prm[pN.order] = "";
 					}
+					/*
 					if(ts.p.datatype==='local' && !grp._locgr) {
 						ts.p.datatype = 'jsonstring';
 						ts.p.datastr = ts.p.data;
 					}
+					*/
 				}
 				$.extend(ts.p.postData,prm);
 				var rcnt = !ts.p.scroll ? 1 : ts.rows.length-1;
@@ -4166,10 +4168,12 @@ $.fn.jqGrid = function( pin ) {
 						return;
 					}
 					addJSONData(dstr);
+					/*
 					if(ts.p.grouping && ts.p.groupingView._locgr) {
 						// back to original data???
 						ts.p.data = dstr;
 					}
+					*/
 					afterprocess(dstr, lcf);
 				break;
 				case "local":
@@ -4675,6 +4679,9 @@ $.fn.jqGrid = function( pin ) {
 				if(ts.p.tblwidth > ts.p.width) {
 					ts.p.colModel[lvc].width -= (ts.p.tblwidth - parseInt(ts.p.width,10));
 					ts.p.tblwidth = ts.p.width;
+				} else if(!hs && ts.p.tblwidth === ts.p.width) {
+					ts.p.colModel[lvc].width -= bstw;
+					ts.p.tblwidth -= bstw;
 				}
 			}
 		},
@@ -13989,15 +13996,15 @@ $.jgrid.extend({
 			}
 			var alert_info = function(){
 				 $.jgrid.info_dialog(o.alertcap,"<div>"+o.alerttext+"</div><span tabindex='0'><span tabindex='-1' id='jqg_alrt'></span></span>","",{
-						jqModal:true,
-						drag:true,
-						resize:true,
-						caption:o.alertcap,
+					jqModal:true,
+					drag:true,
+					resize:true,
+					caption:o.alertcap,
 					width:o.alertwidth,
 					height: o.alertheight,
-						top:o.alerttop,
-						left:o.alertleft,
-						closeOnEscape:o.closeOnEscape, 
+					top:o.alerttop,
+					left:o.alertleft,
+					closeOnEscape:o.closeOnEscape, 
 					styleUI: $t.p.styleUI,
 					zIndex: o.alertzIndex}
 				);
@@ -14803,7 +14810,7 @@ $.jgrid.extend({
 						}
 						footLevel = parseInt($(r).attr("jqfootlevel") ,10);
 						skip = isNaN(footLevel) ? false : 
-						 (grp.showSummaryOnHide && footLevel >= num);
+						 (grp.showSummaryOnHide && footLevel <= num);
 						if( !skip) {
 							$(r).hide();
 						}