@ntlab/ntjs-assets 2.0.17 → 2.0.18

package/assets/js/jqGrid/js/grid.filter.js

@@ -219,7 +219,7 @@ $.fn.jqFilter = function( arg ) {
 
 			if(this.p.ruleButtons === true) {
 			// dropdown for: choosing group operator type
-			var groupOpSelect = $("<select size='1' class='opsel " + classes.srSelect + "'></select>");
+			var groupOpSelect = $("<select size='1' name='select_group_op' class='opsel " + classes.srSelect + "'></select>");
 			th.append(groupOpSelect);
 			// populate dropdown with all posible group operators: or, and
 			var str= "", selected;
@@ -238,7 +238,7 @@ $.fn.jqFilter = function( arg ) {
 			// button for adding a new subgroup
 			var inputAddSubgroup ="<span></span>";
 			if(this.p.groupButton) {
-				inputAddSubgroup = $("<input type='button' value='+ {}' title='" +that.p.addsubgrup+"' class='add-group " + common.button + "'/>");
+				inputAddSubgroup = $("<input type='button' value='+ {}' title='" +that.p.addsubgrup+"' class='add-group " + common.button + "' name='newsubgroup'/>");
 				inputAddSubgroup.on('click',function() {
 					if (group.groups === undefined ) {
 						group.groups = [];
@@ -259,7 +259,7 @@ $.fn.jqFilter = function( arg ) {
 			th.append(inputAddSubgroup);
 			if(this.p.ruleButtons === true) {
 			// button for adding a new rule
-			var inputAddRule = $("<input type='button' value='+' title='"+that.p.addrule+"' class='add-rule ui-add " + common.button + "'/>"), cm;
+			var inputAddRule = $("<input type='button' value='+' title='"+that.p.addrule+"' class='add-rule ui-add " + common.button + "'/ name='newrule'>"), cm;
 			inputAddRule.on('click',function() {
 				//if(!group) { group = {};}
 				if (group.rules === undefined) {
@@ -300,7 +300,7 @@ $.fn.jqFilter = function( arg ) {
 
 			// button for delete the group
 			if (parentgroup !== null) { // ignore the first group
-				var inputDeleteGroup = $("<input type='button' value='-' title='"+that.p.delgroup+"' class='delete-group " + common.button + "'/>");
+				var inputDeleteGroup = $("<input type='button' value='-' title='"+that.p.delgroup+"' class='delete-group " + common.button + "'/ name='delgroup'>");
 				th.append(inputDeleteGroup);
 				inputDeleteGroup.on('click',function() {
 				// remove group from parent
@@ -386,7 +386,7 @@ $.fn.jqFilter = function( arg ) {
 
 
 			// dropdown for: choosing field
-			var ruleFieldSelect = $("<select size='1' class='" + classes.srSelect + "'></select>"), ina, aoprs = [];
+			var ruleFieldSelect = $("<select size='1' name='select_field' class='" + classes.srSelect + "'></select>"), ina, aoprs = [];
 			ruleFieldTd.append(ruleFieldSelect);
 			ruleFieldSelect.on('change',function() {
 				if( that.p.ruleButtons && that.p.uniqueSearchFields ) {
@@ -517,7 +517,7 @@ $.fn.jqFilter = function( arg ) {
 				$(ruleDataInput).attr('disabled','true');
 			} //retain the state of disabled text fields in case of null ops
 			// dropdown for: choosing operator
-			var ruleOperatorSelect = $("<select size='1' class='selectopts " + classes.srSelect + "'></select>");
+			var ruleOperatorSelect = $("<select size='1' name='select_oper' class='selectopts " + classes.srSelect + "'></select>");
 			ruleOperatorTd.append(ruleOperatorSelect);
 			ruleOperatorSelect.on('change',function() {
 				rule.op = $(ruleOperatorSelect).val();
@@ -574,7 +574,7 @@ $.fn.jqFilter = function( arg ) {
 
 			// create button for: delete rule
 			if(this.p.ruleButtons === true) {
-			var ruleDeleteInput = $("<input type='button' value='-' title='"+that.p.delrule+"' class='delete-rule ui-del " + common.button + "'/>");
+			var ruleDeleteInput = $("<input type='button' value='-' title='"+that.p.delrule+"' class='delete-rule ui-del " + common.button + "'/ name='delrule'>");
 			ruleDeleteTd.append(ruleDeleteInput);
 			//$(ruleDeleteInput).html("").height(20).width(30).button({icons: {  primary: "ui-icon-minus", text:false}});
 			ruleDeleteInput.on('click',function() {
@@ -1062,6 +1062,8 @@ $.jgrid.extend({
 					$elem = $("#gs_"+$t.p.idPrefix+$.jgrid.jqID(this.name),(this.frozen===true && $t.p.frozenColumns === true) ?  $t.grid.fhDiv : $t.grid.hDiv);
 					if(this.searchoptions && this.searchoptions.defaultValue !== undefined) {
 						v = this.searchoptions.defaultValue;
+					} else {
+						v = undefined;
 					}
 					nm = this.index || this.name;
 					so[nm] = this.searchoptions && this.searchoptions.sopt ? this.searchoptions.sopt[0] : p.defaultSearch || 'eq';
@@ -1276,6 +1278,9 @@ $.jgrid.extend({
 			if (regional.filterFor) {
 				filterLabel = regional.filterFor;
 			}
+			if($t.p.colSpanHeader.length) {
+				$($t).jqGrid('destroyColSpanHeader', false);
+			}
 			
 			$.each($t.p.colModel,function(ci){
 				var cm=this, soptions, select="", sot="=", so, i, st, csv, df, elem, restores,
@@ -1380,6 +1385,7 @@ $.jgrid.extend({
 									fn : function(e) {
 										var key = e.charCode || e.keyCode || 0;
 										if(key === 13){
+											e.preventDefault();
 											triggerToolbar();
 											return false;
 										}
@@ -1394,6 +1400,7 @@ $.jgrid.extend({
 										if( dKeys.has(key)) {
 											// do nothing
 										} else if( key === 13 ) {
+											e.preventDefault();
 											return false;
 										} else {
 											if(timeoutHnd) { clearTimeout(timeoutHnd); }
@@ -1487,6 +1494,7 @@ $.jgrid.extend({
 			});
 			$(".clearsearchclass",tr).keydown(function(event) {
 				if (event.keyCode === 13) {
+					event.preventDefault();
 					$(".clearsearchclass", tr).trigger("click");
 				}
 			});
@@ -1503,6 +1511,9 @@ $.jgrid.extend({
 				}
 				$t.grid.hScroll = false;
 			});
+			if($t.p.colSpanHeader.length) {
+				setTimeout(function() { $($t).jqGrid('setColSpanHeader');},0);
+			}			
 			this.p.filterToolbar = true;
 			this.triggerToolbar = triggerToolbar;
 			this.clearToolbar = clearToolbar;
@@ -1777,7 +1788,7 @@ $.jgrid.extend({
 				if(p.tmplNames && p.tmplNames.length) {
 					found = true;
 					tmpl = "<tr><td class='ui-search-label'>"+ p.tmplLabel +"</td>";
-					tmpl += "<td><select size='1' class='ui-template " + classes.srSelect + "'>";
+					tmpl += "<td><select size='1' name='select_template' class='ui-template " + classes.srSelect + "'>";
 					tmpl += "<option value='default'>Default</option>";
 					$.each(p.tmplNames, function(i,n){
 						tmpl += "<option value='"+i+"'>"+n+"</option>";
@@ -1868,6 +1879,7 @@ $.jgrid.extend({
 								!$target.hasClass('add-group') && !$target.hasClass('add-rule') &&
 								!$target.hasClass('delete-group') && !$target.hasClass('delete-rule') &&
 								(!$target.hasClass("fm-button") || !$target.is("[id$=_query]"))) {
+							e.preventDefault();
 							$("#"+fid+"_search").click();
 							return false;
 						}

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

@@ -118,8 +118,14 @@ $.jgrid.extend({
 						$.each($t.p.colModel, function(){
 							if(this.name === nm && this.editoptions && $.jgrid.isFunction(this.editoptions.custom_value)) {
 								try {
-									postdata[nm] = this.editoptions.custom_value.call($t, $("#"+$.jgrid.jqID(nm),frmtb),'get');
-									if (postdata[nm] === undefined) {throw "e1";}
+									let cvr = this.editoptions.custom_value.call($t, $("#"+$.jgrid.jqID(nm),frmtb),'get');
+									if( cvr === "#ignoreme#") {
+										
+									} else if (crv === undefined) {
+										throw "e1";
+									} else {
+										postdata[nm] = cvr;
+									}
 								} catch (e) {
 									if (e==="e1") {$.jgrid.info_dialog(errors.errcap,"function 'custom_value' "+rp_ge[$(this)[0]].p.msg.novalue,rp_ge[$(this)[0]].p.bClose, {styleUI : rp_ge[$(this)[0]].p.styleUI });}
 									else {$.jgrid.info_dialog(errors.errcap,e.message,rp_ge[$(this)[0]].p.bClose, {styleUI : rp_ge[$(this)[0]].p.styleUI });}
@@ -267,7 +273,7 @@ $.jgrid.extend({
 								$(tb).append(trdata);
 								trdata[0].rp = rp;
 							}
-							$("td",trdata[0]).eq( cp-2 ).html("<label for='"+nm+"'>"+ (frmopt.label === undefined ? obj.p.colNames[i]: frmopt.label) + "</label>");
+							$("td",trdata[0]).eq( cp-2 ).html("<label for='"+nm+"' class='" + styles.labelClass + "'>"+ (frmopt.label === undefined ? obj.p.colNames[i]: frmopt.label) + "</label>");
 							$("td",trdata[0]).eq( cp-1 ).append(frmopt.elmprefix).append(elc).append(frmopt.elmsuffix);
 							if( maxcols > 1 && hc) {
 								$("td",trdata[0]).eq( cp-2 ).hide();
@@ -337,7 +343,7 @@ $.jgrid.extend({
 									fld[0].checked = false;
 									fld[0].defaultChecked = false;
 									vl = $(fld).attr("offval");
-								} else if (fld[0].type && fld[0].type.substr(0,6)==='select') {
+								} else if (fld[0].type && fld[0].type.slice(0,6)==='select') {
 									fld[0].selectedIndex = 0;
 								} else {
 									fld.val(vl);
@@ -1005,14 +1011,14 @@ $.jgrid.extend({
 				overlayClass: p.overlayClass,
 				focusField : p.focusField,
 				onHide :  function(h) {
-					var fw = $.jgrid.floatNum( $('#editmod'+gID)[0].style.width ),
-						rtlsup = $("#gbox_"+$.jgrid.jqID(gID)).attr("dir") === "rtl" ? true : false,
+					var fw = $('#editmod'+gID)[0].style.width ,
+						//rtlsup = $("#gbox_"+$.jgrid.jqID(gID)).attr("dir") === "rtl" ? true : false,
 						mdh = $('#editmod'+gID)[0].style.height;
 						mdh = ['100%','auto'].includes(mdh) ? mdh : $.jgrid.floatNum(mdh, 200);
-						
+						fw = ['100%','auto'].includes(fw) ? fw : $.jgrid.floatNum(fw, 300);
 					$($t).data("formProp", {
 						top: $.jgrid.floatNum($(h.w).css("top")),
-						left : rtlsup ? ( $("#gbox_"+$.jgrid.jqID(gID)).outerWidth() - fw - parseFloat($(h.w).css("left")) + 12 ) : parseFloat($(h.w).css("left")),
+						left :  parseFloat($(h.w).css("left")),
 						width : fw,
 						height :  mdh ,
 						dataheight : $(frmgr).height(),
@@ -1517,7 +1523,7 @@ $.jgrid.extend({
 		p = $.extend(true, {
 			top : 0,
 			left: 0,
-			width: 240,
+			width: 300,
 			height: 'auto',
 			dataheight : 'auto',
 			modal: false,
@@ -1828,8 +1834,7 @@ $.jgrid.extend({
 		}, regional, p ||{});
 		return this.each(function() {
 			if(this.p.navGrid) {return;}
-			var alertIDs = {themodal: 'alertmod_' + this.p.id, modalhead: 'alerthd_' + this.p.id,modalcontent: 'alertcnt_' + this.p.id},
-			$t = this, twd, tdw, o;
+			var $t = this, twd, tdw, o;
 			if(!$t.grid || typeof elem !== 'string') {return;}
 			if(!$($t).data('navGrid')) {
 				$($t).data('navGrid',p);
@@ -1839,41 +1844,32 @@ $.jgrid.extend({
 			if($t.p.force_regional) {
 				o = $.extend(o, regional);
 			}
-			if ($("#"+alertIDs.themodal)[0] === undefined) {
-				if(!o.alerttop && !o.alertleft) {
-					var pos=$.jgrid.findPos(this);
-					pos[0]=Math.round(pos[0]);
-					pos[1]=Math.round(pos[1]);
-					var hg = isNaN(this.p.height) ? $($t.grid.bDiv).height(): this.p.height;
-					if(hg === 0) {
-						hg = 200;
-					}
-					o.alertleft = pos[0] + (this.p.width/2)-parseInt(o.alertwidth,10)/2;
-					o.alerttop = pos[1] + (hg/2)-25;
-				}
-				var fs =  $('.ui-jqgrid').css('font-size') || '11px';
-				$.jgrid.createModal(alertIDs,
-					"<div>"+o.alerttext+"</div><span tabindex='0'><span tabindex='-1' id='jqg_alrt'></span></span>",
-					{ 
-						gbox:"#gbox_"+$.jgrid.jqID($t.p.id),
+			if(!o.alerttop && !o.alertleft) {
+				var pos=$.jgrid.findPos(this);
+				pos[0]=Math.round(pos[0]);
+				pos[1]=Math.round(pos[1]);
+				var hg = isNaN(this.p.height) ? $($t.grid.bDiv).height(): this.p.height;
+				if(hg === 0) {
+					hg = 200;
+				}
+				o.alertleft = pos[0] + (this.p.width/2)-parseInt(o.alertwidth,10)/2;
+				o.alerttop = pos[1] + (hg/2)-25;
+			}
+			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,
+					width:o.alertwidth,
+					height: o.alertheight,
 						top:o.alerttop,
 						left:o.alertleft,
-						width:o.alertwidth,
-						height: o.alertheight,
 						closeOnEscape:o.closeOnEscape, 
-						zIndex: o.alertzIndex,
-						styleUI: $t.p.styleUI
-					},
-					"#gview_"+$.jgrid.jqID($t.p.id),
-					$("#gbox_"+$.jgrid.jqID($t.p.id))[0],
-					true,
-					{"font-size": fs}
+					styleUI: $t.p.styleUI,
+					zIndex: o.alertzIndex}
 				);
-			}
+			};
 			var clone = 1, i,
 			onHoverIn = function () {
 				if (!$(this).hasClass(commonstyle.disabled)) {
@@ -1945,7 +1941,7 @@ $.jgrid.extend({
 									$($t).jqGrid("editGridRow",sr,pEdit);
 								}
 							} else {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqm:true});
+								alert_info();
 								$("#jqg_alrt").focus();
 							}
 						}
@@ -1971,7 +1967,7 @@ $.jgrid.extend({
 									$($t).jqGrid("viewGridRow",sr,pView);
 								}
 							} else {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqm:true});
+								alert_info();
 								$("#jqg_alrt").focus();
 							}
 						}
@@ -2003,7 +1999,7 @@ $.jgrid.extend({
 									$($t).jqGrid("delGridRow",dr,pDel);
 								}
 							} else  {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqm:true});$("#jqg_alrt").focus();
+								alert_info();
 							}
 						}
 						return false;
@@ -2079,11 +2075,11 @@ $.jgrid.extend({
 				if($t.p._nvtd) {
 					if(o.dropmenu) {
 						navtbl = null;
-						$($t).jqGrid('_buildNavMenu', pgid, elemids, p, pEdit, pAdd, pDel, pSearch, pView );						
+						$($t).jqGrid('_buildNavMenu', pgid, elemids, $.extend(p,{'ainfo':alert_info}), pEdit, pAdd, pDel, pSearch, pView );						
 					} else if(twd > $t.p._nvtd[0] ) {
 						if($t.p.responsive) {
 							navtbl = null;
-							$($t).jqGrid('_buildNavMenu', pgid, elemids, p, pEdit, pAdd, pDel, pSearch, pView );
+							$($t).jqGrid('_buildNavMenu', pgid, elemids, $.extend(p,{'ainfo':alert_info}), pEdit, pAdd, pDel, pSearch, pView );
 						} else {
 							$(pgid+"_"+o.position,pgid).append(navtbl).width(twd);
 						}
@@ -2261,15 +2257,14 @@ $.jgrid.extend({
 			bt = p.navButtonText ? p.navButtonText : regional.selectcaption || 'Actions',
 			act = "<button class='dropdownmenu "+commonstyle.button+"' value='"+mid+"'>" + bt +"</button>";
 			$(elem+"_"+p.position, elem).append( act );
-			var alertIDs = {themodal: 'alertmod_' + this.p.id, modalhead: 'alerthd_' + this.p.id,modalcontent: 'alertcnt_' + this.p.id},
-			_buildMenu = function() {
+			var _buildMenu = function() {
 				var fs =  $('.ui-jqgrid').css('font-size') || '11px',
 				eid, itm,
-				str = $('<ul id="'+mid+'" class="ui-nav-menu modal-content" role="menu" tabindex="0" style="display:none;font-size:'+fs+'"></ul>');
+				str = $('<ul id="'+mid+'" class="ui-nav-menu modal-content ui-menu column-menu jqgrid-column-menu ' + commonstyle.shadow + '" role="menu" tabindex="0" style="display:none;font-size:'+fs+'"></ul>');
 				if( p.add ) {
 					pAdd = pAdd || {};
 					eid = pAdd.id || "add_"+elemids;
-					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.addtext || p.addtitle)+'</a></li>').click(function(){
+					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.addtext.trim() || p.addtitle)+'</a></li>').click(function(){
 						if (!$(this).hasClass( commonstyle.disabled )) {
 							if ($.jgrid.isFunction( p.addfunc )) {
 								p.addfunc.call($t);
@@ -2285,7 +2280,7 @@ $.jgrid.extend({
 				if( p.edit ) {
 					pEdit = pEdit || {};
 					eid = pEdit.id || "edit_"+elemids;
-					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.edittext || p.edittitle)+'</a></li>').click(function(){
+					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.edittext.trim() || p.edittitle)+'</a></li>').click(function(){
 						if (!$(this).hasClass( commonstyle.disabled )) {
 							var sr = $t.p.selrow;
 							if (sr) {
@@ -2295,7 +2290,7 @@ $.jgrid.extend({
 									$($t).jqGrid("editGridRow",sr,pEdit);
 								}
 							} else {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqm:true});
+								p.ainfo();
 								$("#jqg_alrt").focus();
 							}
 							$(str).hide();
@@ -2307,7 +2302,7 @@ $.jgrid.extend({
 				if( p.view ) {
 					pView = pView || {};
 					eid = pView.id || "view_"+elemids;
-					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.viewtext || p.viewtitle)+'</a></li>').click(function(){
+					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.viewtext.trim() || p.viewtitle)+'</a></li>').click(function(){
 						if (!$(this).hasClass( commonstyle.disabled )) {
 							var sr = $t.p.selrow;
 							if (sr) {
@@ -2317,7 +2312,7 @@ $.jgrid.extend({
 									$($t).jqGrid("viewGridRow",sr,pView);
 								}
 							} else {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqm:true});
+								p.ainfo();
 								$("#jqg_alrt").focus();
 							}
 							$(str).hide();
@@ -2329,7 +2324,7 @@ $.jgrid.extend({
 				if( p.del ) {
 					pDel = pDel || {};
 					eid = pDel.id || "del_"+elemids;
-					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.deltext || p.deltitle)+'</a></li>').click(function(){
+					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.deltext.trim() || p.deltitle)+'</a></li>').click(function(){
 						if (!$(this).hasClass( commonstyle.disabled )) {
 							var dr;
 							if($t.p.multiselect) {
@@ -2345,7 +2340,7 @@ $.jgrid.extend({
 									$($t).jqGrid("delGridRow",dr,pDel);
 								}
 							} else  {
-								$.jgrid.viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$.jgrid.jqID($t.p.id),jqm:true});$("#jqg_alrt").focus();
+								p.ainfo();
 							}
 							$(str).hide();
 						}
@@ -2359,7 +2354,7 @@ $.jgrid.extend({
 				if( p.search ) {
 					pSearch = pSearch || {};
 					eid = pSearch.id || "search_"+elemids;
-					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.searchtext || p.searchtitle)+'</a></li>').click(function(){
+					itm = $('<li class="ui-menu-item" role="presentation"><a class="'+ commonstyle.cornerall+' g-menu-item" tabindex="0" role="menuitem" id="'+eid+'">'+(p.searchtext.trim() || p.searchtitle)+'</a></li>').click(function(){
 						if (!$(this).hasClass( commonstyle.disabled )) {
 							if($.jgrid.isFunction( p.searchfunc )) {
 								p.searchfunc.call($t, pSearch);
@@ -2425,7 +2420,7 @@ $.jgrid.extend({
 				//if( $("#"+mid)[0] === undefined)  {
 					//_buildMenu();
 				//}
-				$("#"+bid).show().css({"top":top - ($("#"+bid).height() +10)+"px", "left":left+"px"});
+				$("#"+bid).show().css({"top":top - ($("#"+bid).height() + 35)+"px", "left":left+"px"});
 				e.stopPropagation();
 			});
 			$("body").on('click', function(e){

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

@@ -272,6 +272,15 @@ $.jgrid.extend({
 				}
 				tarspan.removeClass(plus).addClass(minus);
 			}
+			if(frz && $t.p.height === 'auto'){
+				$t.grid.fbDiv.height($($t).height());
+				if($t.grid.fsDiv) {
+					var hasscroll = $($t.grid.bDiv)[0].scrollWidth > $($t.grid.bDiv)[0].clientWidth,
+					//scrollbar height
+					scrollh = hasscroll ? $.jgrid.scrollbarHeight() : 0;
+					$t.grid.fsDiv.css('top', ($t.grid.fbDiv.position().top + $($t).height()) + scrollh + 'px');
+				}
+			}
 			$($t).triggerHandler("jqGridGroupingClickGroup", [hid , collapsed]);
 			if( $.jgrid.isFunction($t.p.onClickGroup)) { $t.p.onClickGroup.call($t, hid , collapsed); }
 
@@ -386,6 +395,7 @@ $.jgrid.extend({
 								nv.v = (nv.v/n.cnt);
 							}
 						}
+						nv.uv = nv.v;
 						try {
 							nv.v = $t.formatter('',nv.v, ci, this);
 						} catch (e) {}
@@ -864,7 +874,8 @@ $.jgrid.extend({
 					$($focusElem).focus();
 				} catch(fe) {}
 			}
-			if( $.jgrid.trim($("tr.jqg-second-row-header th").eq( 0 ).text()) === "" ) {
+			var testws = $("tr.jqg-second-row-header th").eq( 0 );
+			if( $.jgrid.type(testws)==='object' && testws.length && $.jgrid.trim(testws[0].outerText) === "" ) {
 				$("tr.jqg-second-row-header th").eq( 0 ).prepend(' ');
 			}
 			if(frozen) {

package/assets/js/jqGrid/js/grid.import.js

@@ -538,7 +538,8 @@ $.extend($.jgrid,{
 				beforeExport : null,
 				exporthidden : false,
 				exportgrouping: false,
-				exportOptions : {}
+				exportOptions : {},
+				method : 'GET'
 			}, o || {});
 			return this.each(function(){
 				if(!this.grid) { return;}
@@ -569,10 +570,14 @@ $.extend($.jgrid,{
 							pdata.groupingView = expg;
 						}
 					}
-					var params = jQuery.param(pdata);
-					if(o.url.indexOf("?") !== -1) { url = o.url+"&"+params; }
-					else { url = o.url+"?"+params; }
-					window.location = url;
+					try {
+						$.jgrid.postForm(o.url, pdata, o.method);
+					} catch (e) {
+						var params = jQuery.param(pdata);
+						if(o.url.indexOf("?") !== -1) { url = o.url+"&"+params; }
+						else { url = o.url+"?"+params; }
+						window.location = url;
+					}
 				}
 			});
 		}

package/assets/js/jqGrid/js/grid.inlinedit.js

@@ -147,12 +147,12 @@ $.jgrid.extend({
 								return false;
 							}
 							if (e.keyCode === 13) {
-								var ta = e.target;
-								if(ta.tagName === 'TEXTAREA') { return true; }
+								e.preventDefault();
 								if($.jgrid.isFunction( o.onEnter )) {
 									o.onEnter.call($t, rowid, o, e);
 									return true;
 								}
+								if(e.target.tagName === 'TEXTAREA') { return true; }
 								if( $($t).jqGrid("saveRow", rowid, o ) ) {
 									if($t.p.inlineNav) {
 										try {

package/assets/js/jqGrid/js/grid.subgrid.js

@@ -27,7 +27,8 @@ setSubGrid : function () {
 			expandOnLoad:  false,
 			selectOnExpand : false,
 			selectOnCollapse : false,
-			reloadOnExpand : true
+			reloadOnExpand : true,
+			onErrorLoadData : null
 		};
 		$t.p.subGridOptions = $.extend(suboptions, $t.p.subGridOptions || {});
 		$t.p.colNames.unshift("");
@@ -54,7 +55,8 @@ addSubGrid : function( pos, sind ) {
 		var ts = this;
 		if (!ts.grid ) { return; }
 		var base = $.jgrid.styleUI[(ts.p.styleUI || 'jQueryUI')].base,
-			common = $.jgrid.styleUI[(ts.p.styleUI || 'jQueryUI')].common;
+			common = $.jgrid.styleUI[(ts.p.styleUI || 'jQueryUI')].common,
+			errors = $.jgrid.getRegional(this, 'errors');
 		//-------------------------
 		var subGridCell = function(trdiv,cell,pos)
 		{
@@ -171,13 +173,25 @@ addSubGrid : function( pos, sind ) {
 						url: $.jgrid.isFunction(ts.p.subGridUrl) ? ts.p.subGridUrl.call(ts, dp) : ts.p.subGridUrl,
 						dataType:ts.p.subgridtype,
 						data: $.jgrid.isFunction(ts.p.serializeSubGridData)? ts.p.serializeSubGridData.call(ts, dp) : dp,
-						complete: function(sxml) {
+						success: function(res, stat, sxml) {
 							if(ts.p.subgridtype === "xml") {
 								subGridXml(sxml.responseXML, sid);
 							} else {
 								subGridJson($.jgrid.parse(sxml.responseText), sid);
 							}
 							sxml=null;
+						}, 
+						error : function(res, stat, err) {
+							if($.jgrid.isFunction(ts.p.subGridOptions.onErrorLoadData) ) {
+								ts.p.subGridOptions.onErrorLoadData.call(ts, rowid, res, stat, err);
+							} else {
+								var rT = res.responseText +" <br/>"+res.statusText;
+								try {
+									$.jgrid.info_dialog(errors.errcap,'<div class="'+common.error+'">'+ rT +'</div>', edit.bClose, {buttonalign:'right', styleUI : ts.p.styleUI });
+								} catch(e) {
+									alert(rT);
+								}
+							}							
 						}
 					}, $.jgrid.ajaxOptions, ts.p.ajaxSubgridOptions || {}));
 					break;