@ntlab/ntjs-assets 2.36.0 → 2.37.0

package/assets/js/jqGrid/js/grid.common.js

@@ -196,7 +196,9 @@ $.extend($.jgrid,{
 			onHide: $.jgrid.closeModal,
 			gbox: '',
 			jqm : true,
-			jqM : true
+			jqM : true 
+			//duration : 400,
+			//easing: "swing"
 		}, o || {});
 		var style="";
 		if(o.gbox) {
@@ -255,7 +257,10 @@ $.extend($.jgrid,{
 			buttonalign : 'center',
 			buttons : [], 
 			overlay : 10,
-			overlayClass : ''
+			overlayClass : '',
+			autoClose : false,
+			autoCloseTime: 3500,
+			position : ""
 		// {text:'textbutt', id:"buttid", onClick : function(){...}}
 		// if the id is not provided we set it like info_button_+ the index in the array - i.e info_button_0,info_button_1...
 		};
@@ -275,12 +280,12 @@ $.extend($.jgrid,{
 				buttstr += "<a id='"+mopt.buttons[i].id+"' class='fm-button " + common.button+"'>"+mopt.buttons[i].text+"</a>";
 			}
 		}
-		var dh = isNaN(mopt.dataheight) ? mopt.dataheight : mopt.dataheight+"px",
-		cn = "text-align:"+mopt.align+";";
+		var dh = isNaN(mopt.dataheight) ? mopt.dataheight : mopt.dataheight+"px";
+		//cn = "text-align:"+mopt.align+";";
 		var cnt = "<div id='info_id'>";
-		cnt += "<div id='infocnt' class='"+classes.body+"' style='margin:0px;padding-bottom:1em;width:100%;overflow:auto;position:relative;height:"+dh+";"+cn+"'>"+content+"</div>";
-		cnt += c_b ? "<div class='" + classes.footer + "' style='text-align:"+mopt.buttonalign+";padding-bottom:0.8em;padding-top:0.5em;background-image: none;border-width: 1px 0 0 0;'><a id='closedialog' class='fm-button " + common.button + "'>"+c_b+"</a>"+buttstr+"</div>" :
-			buttstr !== ""  ? "<div class='" + classes.footer + "' style='text-align:"+mopt.buttonalign+";padding-bottom:0.8em;padding-top:0.5em;background-image: none;border-width: 1px 0 0 0;'>"+buttstr+"</div>" : "";
+		cnt += "<div id='infocnt' class='info_content "+classes.body+"'>"+content+"</div>";
+		cnt += c_b ? "<div class='info_footer " + classes.footer + "'><a id='closedialog' class='fm-button " + common.button + "'>"+c_b+"</a>"+buttstr+"</div>" :
+			buttstr !== ""  ? "<div class='info_footer " + classes.footer + "'>"+buttstr+"</div>" : "";
 		cnt += "</div>";
 
 		try {
@@ -300,6 +305,43 @@ $.extend($.jgrid,{
 			'','',true, 
 			{ "font-size":fs}
 		);
+		if(mopt.position) {
+			var inf_dlg_pos = mopt.position.split(" "), d_clas;
+			switch (inf_dlg_pos[0].toLowerCase() + " " + inf_dlg_pos[1].toLowerCase() ) 
+			{
+				case  'top left':
+					d_clas = 'top-0 start-0';
+				break;
+				case  'top center':
+					d_clas = 'top-0 start-50 translate-middle-x';
+				break;
+				case  'top right':
+					d_clas = 'top-0 end-0';
+				break;
+				case  'middle left':
+					d_clas = 'top-50 start-0 translate-middle-y';
+				break;
+				case  'middle center':
+					d_clas = 'top-50 start-50 translate-middle';
+				break;
+				case  'middle right':
+					d_clas = 'top-50 end-0 translate-middle-y';
+				break;
+				case  'bottom left':
+					d_clas = 'bottom-0 start-0';
+				break;
+				case  'bottom center':
+					d_clas = 'bottom-0 start-50 translate-middle-x';
+				break;
+				case  'bottom right':
+					d_clas = 'bottom-0 end-0';
+				break;
+				default :
+					d_clas = 'top-50 start-50 translate-middle';
+			}
+			$("#info_dialog").addClass(d_clas).css({"top":"", "left":"", "width":"auto", "max-width": "500px"});
+		}
+		$(".info_content","#info_id").height(dh);
 		// attach onclick after inserting into the dom
 		if(buttstr) {
 			$.each(mopt.buttons,function(i){
@@ -314,24 +356,64 @@ $.extend($.jgrid,{
 			});
 			return false;
 		});
+		if(mopt.autoClose) {
+			setTimeout(function() {
+				$(".ui-jqdialog-titlebar-close", "#info_head").trigger('click');
+			}, mopt.autoCloseTime)
+		}
 		$(".fm-button","#info_dialog").hover(
 			function(){$(this).addClass(common.hover);},
 			function(){$(this).removeClass(common.hover);}
 		);
 		if($.jgrid.isFunction(mopt.beforeOpen) ) { mopt.beforeOpen(); }
+		if(mopt.type && mopt.type !== "default") {
+			$("#info_dialog").addClass("toast-"+mopt.type)
+		}
 		$.jgrid.viewModal("#info_dialog",{
 			onHide: function(h) {
-				h.w.hide().remove();
-				if(h.o) { h.o.remove(); }
+				$.jgrid.closeModal(h);
+				h.w.remove();
+				//if(h.o) { h.o.remove(); }
 			},
 			modal :mopt.modal,
 			jqm:jm,
 			overlay : mopt.overlay,
 			overlayClass : mopt.overlayClass
+			//duration : mopt.duration || 400,
+			//easing: mopt.easing || "swing"
 		});
 		if($.jgrid.isFunction(mopt.afterOpen) ) { mopt.afterOpen(); }
 		try{ $("#info_dialog").focus();} catch (m){}
 	},
+	toast : function( o ) {
+		var opt  = {
+			caption : "",
+			text :"",
+			close_icon : true,
+			type: "default", //error, warning, info, success
+			close_button : '',
+			autoClose : true,
+			autoCloseTime : 2000,
+			drag: false,
+			position : "middle center",
+			jqModal:false, 
+			duration:600,
+			removemodal : true
+		};
+		$.extend(true, opt, $.jgrid.jqModal || {}, {caption: opt.caption }, o || {});
+		if(!opt.text) {
+			return;
+		}
+		$.jgrid.info_dialog(opt.header, opt.text, opt.close_button, opt);
+		if(!opt.caption) {
+			$(".ui-jqdialog-titlebar","#info_dialog").hide();
+			if(opt.close_icon) {
+				var close_but = $(".ui-jqdialog-titlebar-close","#info_dialog").clone(true);
+				$(close_but).insertAfter($("#infocnt"));
+				$("#info_id").css({"padding-right": "35px", "padding-left": "20px"});
+			}
+		}
+	},
 	bindEv: function  (el, opt) {
 		var $t = this;
 		if($.jgrid.isFunction(opt.dataInit)) {

package/assets/js/jqGrid/js/grid.export.js

@@ -22,21 +22,27 @@ $.jgrid = $.jgrid || {};
 
 
 $.extend($.jgrid,{
-	formatCell : function ( cellval , colpos, rwdat, cm, $t, etype){
-		var v;
+	formatCell : function ( cellval , colpos, rwdat, cm, $t, etype, adf, acf){
+		var v = cellval;
+		if( adf === undefined ) {
+			adf = true;
+		}
+		if( acf === undefined ) {
+			acf = true;
+		}
 		if(cm.formatter !== undefined) {
 			var opts= {rowId: '', colModel:cm, gid: $t.p.id, pos:colpos, styleUI: '', isExported : true, exporttype : etype };
 			if($.jgrid.isFunction( cm.formatter ) ) {
+				if(acf) {
 				v = cm.formatter.call($t,cellval,opts,rwdat);
+				}
 			} else if($.fmatter){
+				if(adf) {
 				v = $.fn.fmatter.call($t,cm.formatter,cellval,opts,rwdat);
-			} else {
-				v = cellval;
 			}
-		} else {
-			v = cellval;
 		}
-		return v;
+		}
+		return v == null ? '' : v;
 	},
 	formatCellCsv : function (v, p) {
 		v = v == null ? '' : String(v);
@@ -86,6 +92,11 @@ $.extend($.jgrid,{
 		}
 		return currNode;
 	},
+	xmlToString : function (xmlDom) {
+		return (typeof XMLSerializer!=="undefined") ? 
+			(new window.XMLSerializer()).serializeToString(xmlDom) : 
+			xmlDom.xml;
+	},
 	xmlToZip : function ( zip, obj ) {
 		var $t = this,
 		xmlserialiser = new XMLSerializer(),
@@ -408,6 +419,12 @@ $.extend($.jgrid,{
 		if( $.isEmptyObject( obj )) {
 			obj.excel_parsers = true;
 		}
+		var checkSt = true;
+		if(styleSh == null) {
+			var es= $.jgrid.excelStrings;
+			styleSh = $.parseXML( es['xl/styles.xml']);
+			checkSt = false;
+		}
 		//var	styleSh = $.parseXML( $.jgrid.excelStrings['xl/styles.xml']), //xlsx.xl["styles.xml"];
 		var formats = styleSh.getElementsByTagName("numFmts")[0],
 		celsX = styleSh.getElementsByTagName("cellXfs")[0];
@@ -455,14 +472,18 @@ $.extend($.jgrid,{
 			celsX.appendChild( mycell );
 			count = $('cellXfs xf', styleSh).length;
 			$(celsX).attr("count", count);
-			obj[style] = count - 1;
+			obj[style] = count-1;
+			if(!checkSt) {
+				es['xl/styles.xml'] = $.jgrid.xmlToString( styleSh );
+			}
 		}
 		return obj;
 	},
 	newExcelStyle : function ( xlsx, options ) {
 		options = $.extend(true, {
 			font : { size : 11, name : 'Calibri', options :""}, // options <b/> <i/> <u/>
-			color : { patternType : "solid", fgColor : "FFFFFFF", bgColor : 64 } // bgColor if number 0-64
+			color : { patternType : "solid", fgColor : "FFFFFFF", bgColor : 64 }, // bgColor if number 0-64
+			border : 0 //{leftStyle : 'none', rightStyle:'none', topStyle : 'none', bottomStyle : none, color : 'auto'}
 		}, options || {});
 		//PatterType can be one of the following
 		/*
@@ -470,6 +491,14 @@ $.extend($.jgrid,{
 			darkUp,darkVertical,gray0625,gray125,lightDown,lightGray,lightGrid
 			lightHorizontal,lightTrellis,lightUp,lightVertical,mediumGray
 		*/
+		// border style values can be
+		/*
+		  dashDot, dashDotDot, dashed, dotted, double, hair, medium, mediumDashDot,
+		  mediumDashDotDot, mediumDashed, none, slantDashDot, thick, thin
+		 */
+		/* color can be
+		  auto or string representing rgb value or number from 0-64
+		*/
 		//styleSheet.childNodes[0].childNodes[0] ==> number formats  <numFmts count="6"> </numFmts>
 		//styleSheet.childNodes[0].childNodes[1] ==> fonts           <fonts count="5" x14ac:knownFonts="1"> </fonts>
 		//styleSheet.childNodes[0].childNodes[2] ==> fills           <fills count="6"> </fills>
@@ -478,10 +507,11 @@ $.extend($.jgrid,{
 		//styleSheet.childNodes[0].childNodes[5] ==> cell xfs        <cellXfs count="69"> </cellXfs>
 		//on the last line we have the 69 currently built in styles (0 - 68)
 
-		var sSh = xlsx.xl['styles.xml'];
-		var lastXfIndex   = $('cellXfs xf', sSh).length - 1;
-		var lastFontIndex = $('fonts font', sSh).length - 1;
-		var lastFillIndex = $('fills fill', sSh).length - 1;
+		var sSh = xlsx.xl['styles.xml'],
+		   lastXfIndex   = $('cellXfs xf', sSh).length - 1,
+		   lastFontIndex = $('fonts font', sSh).length - 1,
+		   lastFillIndex = $('fills fill', sSh).length - 1,
+		   lastBorderIndex = $('borders border', sSh).length - 1;
 
 
 		var font1 =
@@ -491,9 +521,9 @@ $.extend($.jgrid,{
                 options.font.options +
         '</font>';
 		sSh.childNodes[0].childNodes[1].innerHTML += font1; //new font
-		var bgcolor = 'indexed=';
+		var bgcolor = 'rgb =';
 		if(parseInt(options.color.bgColor,10) >= 0 ) {
-			bgcolor = 'rgb=';
+			bgcolor = 'indexed =';
 		}
 		bgcolor += '"'+options.color.bgColor+'"';
 		var color1 = 
@@ -504,7 +534,37 @@ $.extend($.jgrid,{
 			'</patternFill>'+
 		'</fill>';		
 		sSh.childNodes[0].childNodes[2].innerHTML += color1; //new color
-        var s1 = '<xf numFmtId="0" fontId="'+(lastFontIndex+1)+'" fillId="'+(lastFillIndex+1)+'" borderId="0" applyFont="1" applyFill="1" applyBorder="1" xfId="0" applyAlignment="1"></xf>';
+		if($.isPlainObject(options.border)) {
+			options.border = $.extend({leftStyle : 'none', rightStyle:'none', topStyle : 'none', bottomStyle : 'none', color : 'auto'}, options.border || {})
+			var bcolor;
+			if(options.border.color === 'auto') {
+				bcolor = 'auto="1"'; 
+			} else if( $.fmatter.isNumber(options.border.color) ) {
+				bcolor = 'indexed="'+options.border.color+'"';
+			} else if($.fmatter.isString(options.border.color)) {
+				bcolor = 'rgb="'+options.border.color+'"';
+			}
+			var border1 =
+			'<border diagonalUp="false" diagonalDown="false">'+
+				'<left style="'+options.border.leftStyle+'">' +
+					'<color '+bcolor+' />'+
+				'</left>'+
+				'<right style="'+options.border.rightStyle+'">' +
+					'<color '+bcolor+' />'+
+				'</right>'+
+				'<top style="'+options.border.topStyle+'">' +
+					'<color '+bcolor+' />'+
+				'</top>'+
+				'<bottom style="'+options.border.bottomStyle+'">' +
+					'<color '+bcolor+' />'+
+				'</bottom>'+
+				'<diagonal />'+
+			'</border>';
+			sSh.childNodes[0].childNodes[3].innerHTML += border1; //new border
+		} else {
+			lastBorderIndex = parseInt(options.border,10)-1;
+		}
+        var s1 = '<xf numFmtId="0" fontId="'+(lastFontIndex+1)+'" fillId="'+(lastFillIndex+1)+'" borderId="'+(lastBorderIndex+1)+'" applyFont="1" applyFill="1" applyBorder="1" xfId="0" applyAlignment="1"></xf>';
 		sSh.childNodes[0].childNodes[5].innerHTML += s1;
 		return (lastXfIndex + 1);
 	}
@@ -535,7 +595,9 @@ $.jgrid.extend({
 			onBeforeExport : null,
 			treeindent : ' ',
 			visibleTreeNodes : false,
-			loadIndicator : true // can be a function
+			loadIndicator : true, // can be a function
+			applyDefFmt : true,
+			applyCustFmt : true
 		}, p || {});
 		var ret ="";
 		this.each(function(){
@@ -678,7 +740,7 @@ $.jgrid.extend({
 							for(ik = 0; ik < cm.length; ik++) {
 								if(cm[ik]._expcol) {
 									arr[k] = $.jgrid.formatCellCsv(
-										$.jgrid.formatCell( $.jgrid.getAccessor(to, cm[ik].name), ik, to, cm[ik], $t, 'csv' ) , p);
+										$.jgrid.formatCell( $.jgrid.getAccessor(to, cm[ik].name), ik, to, cm[ik], $t, 'csv', p.applyDefFmt, p.applyCustFmt ) , p);
 									k++;
 								}
 							}
@@ -750,7 +812,7 @@ $.jgrid.extend({
 					k =0;
 					for(i = 0; i < cmlen; i++) {
 						if(cm[i]._expcol) {
-							tmp[k] = $.jgrid.formatCellCsv( $.jgrid.formatCell( $.jgrid.getAccessor(row, cm[i].name) , i, row, cm[i], $t, 'csv' ), p );
+							tmp[k] = $.jgrid.formatCellCsv( $.jgrid.formatCell( $.jgrid.getAccessor(row, cm[i].name) , i, row, cm[i], $t, 'csv', p.applyDefFmt, p.applyCustFmt ), p );
 							k++;
 						}
 					}
@@ -865,7 +927,9 @@ $.jgrid.extend({
 			replaceStr : null,
 			treeindent : ' ',
 			visibleTreeNodes : false,
-			loadIndicator : true // can be a function
+			loadIndicator : true, // can be a function
+			applyDefFmt : true,
+			applyCustFmt : true
 		}, o || {} );
 		this.each(function() {
 			var $t = this,
@@ -1044,7 +1108,7 @@ $.jgrid.extend({
 					}
 					if(!header) {
 						omit = (i===0 && skipfirstcol);
-						v = omit || (skipfirstcol && v==='') ? v : $.jgrid.formatCell( v, data.map[i], row, cm[data.map[i]], $t, 'excel');
+						v = omit || (skipfirstcol && v==='') ? v : $.jgrid.formatCell( v, data.map[i], row, cm[data.map[i]], $t, 'excel', o.applyDefFmt, o.applyCustFmt);
 						// convert whitespace from formatter to empty string
 						if(v && (v==='&nbsp;' || v==='&#160;' || (v.length===1 && v.charCodeAt(0)===160))) { 
 							v = '';
@@ -1099,7 +1163,7 @@ $.jgrid.extend({
 											break;
 										}
 									}
-									cell = _makeCellSpecial( {r: cellId,s: special.style}, v );
+									cell = _makeCellSpecial( { r: cellId,s: special.style}, v );
 								}
 								rowNode.appendChild( cell );
 								break;
@@ -1520,7 +1584,9 @@ $.jgrid.extend({
 			treeindent : "-",
 			visibleTreeNodes : false,
 			centerTableOnPage : false,
-			loadIndicator : true // can be a function
+			loadIndicator : true, // can be a function
+			applyDefFmt : true,
+			applyCustFmt : true
 
 		}, o || {} );
 		return this.each(function() {
@@ -1554,7 +1620,7 @@ $.jgrid.extend({
 						ommit = !(key === 0 && skipfirstcol);// ? false : true;
 						val = row[def[key]];
 						obj = {
-							text: val == null || val === '' ? '' : (fmt && ommit ? $.jgrid.formatCell( val + '', map[k], data[i], cm[map[k]], $t, 'pdf') : val),
+							text: fmt && ommit ? $.jgrid.formatCell( val + '', map[k], data[i], cm[map[k]], $t, 'pdf', o.applyDefFmt, o.applyCustFmt) : val,
 							alignment : align[key],
 							style : 'tableBody'
 						};
@@ -1832,7 +1898,7 @@ $.jgrid.extend({
 					row = data[i];
 					for( key = 0;key < def.length; key++ ) {
 						obj	= {
-							text: row[def[key]] == null ? '' : $.jgrid.stripHtml($.jgrid.formatCell( $.jgrid.getAccessor(row, def[key]) + '', map[k], data[i], cm[map[k]], $t, 'pdf')),
+							text: $.jgrid.stripHtml($.jgrid.formatCell( $.jgrid.getAccessor(row, def[key]) + '', map[k], data[i], cm[map[k]], $t, 'pdf', o.applyDefFmt, o.applyCustFmt)),
 							alignment : align[def[key]],
 							style : 'tableBody'
 						};
@@ -1971,7 +2037,9 @@ $.jgrid.extend({
 			returnAsString : false,
 			treeindent : '&nbsp;',
 			visibleTreeNodes : false,
-			loadIndicator : true // can be a function
+			loadIndicator : true, // can be a function
+			applyDefFmt : true,
+			applyCustFmt : true
 		}, o || {} );
 		var ret;
 		this.each(function() {
@@ -2053,7 +2121,7 @@ $.jgrid.extend({
 					}
 					f= data.header[i];
 					if (d.hasOwnProperty(f) ) {
-						str += '<'+tag+stl+'>'+ (frm ? $.jgrid.formatCell( $.jgrid.getAccessor( d, f ), data.map[i], d, cm[data.map[i]], $t, 'html') : d[f])+'</'+tag+'>';
+						str += '<'+tag+stl+'>'+ (frm ? $.jgrid.formatCell( $.jgrid.getAccessor( d, f ), data.map[i], d, cm[data.map[i]], $t, 'html', o.applyDefFmt, o.applyCustFmt) : d[f])+'</'+tag+'>';
 					}
 					if(colsp) {
 						break;

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

@@ -884,13 +884,7 @@ $.jgrid.extend({
 					var $elem, fcol = false;
 					nm = this.index || this.name;
 					sop = this.searchoptions || {};
-
-					if(this.frozen===true && $t.p.frozenColumns === true) {
-						$elem = $("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(this.name), $t.grid.fhDiv );
-						fcol = true;
-					} else {
 						$elem = $("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(this.name), $t.grid.hDiv);
-					}
 					//var $elem = $("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(this.name),  ?  $t.grid.fhDiv : $t.grid.hDiv);
 					// in case frozen col is outside the rule list
 					if($elem[0] === undefined) {
@@ -935,7 +929,7 @@ $.jgrid.extend({
 					if(so==="bt") {
 						bbt = true;
 					}
-					if(fcol && (nm !== 'cb' && nm!== 'rn' && nm !== 'subgrid' && nm !== 'sc') ) {
+					if( !$.jgrid.isServiceCol( nm ) /*(nm !== 'cb' && nm!== 'rn' && nm !== 'subgrid' && nm !== 'sc')*/ ) {
 						afrcol[nm] = v;
 					}
 					if(v || so==="nu" || so==="nn" || $.inArray(so, unaryOpers) >=0) {
@@ -1045,21 +1039,19 @@ $.jgrid.extend({
 					saveurl = $t.p.url;
 					$($t).jqGrid("setGridParam", { url: p.url });
 				}
+				var ae = document.activeElement;
 				var bsr = $($t).triggerHandler("jqGridToolbarBeforeSearch") === 'stop' ? true : false;
 				if(!bsr && $.jgrid.isFunction(p.beforeSearch)){bsr = p.beforeSearch.call($t);}
 				if(!bsr) { $($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[ { page: currentPage } ] ); }
 				if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});}
 				$($t).triggerHandler("jqGridToolbarAfterSearch");
 				if($.jgrid.isFunction(p.afterSearch)){p.afterSearch.call($t);}
-				if($t.p.frozenColumns) {
-					setToolbarFozenVal(afrcol,sopt,ssfield, arcustom );
-				}
 			},
 			clearToolbar = function(trigger){
 				var sdata={}, so={}, j=0, nm, $elem, v;
 				trigger = (typeof trigger !== 'boolean') ? true : trigger;
 				$.each($t.p.colModel,function(){
-					$elem = $("#gs_"+$t.p.idPrefix+$.jgrid.jqID(this.name),(this.frozen===true && $t.p.frozenColumns === true) ?  $t.grid.fhDiv : $t.grid.hDiv);
+					$elem = $("#gs_"+$t.p.idPrefix+$.jgrid.jqID(this.name), $t.grid.hDiv);
 					if(this.searchoptions && this.searchoptions.defaultValue !== undefined) {
 						v = this.searchoptions.defaultValue;
 					} else {
@@ -1117,7 +1109,7 @@ $.jgrid.extend({
 						ruleGroup += "\"data\":\"" + n.replace(/\\/g,'\\\\').replace(/\"/g,'\\"') + "\"}";
 						gi++;
 						if(p.searchOperators) {
-							$elem = $("#gs_"+$t.p.idPrefix+$.jgrid.jqID(i),(this.frozen===true && $t.p.frozenColumns === true) ?  $t.grid.fhDiv : $t.grid.hDiv);
+							$elem = $("#gs_"+$t.p.idPrefix+$.jgrid.jqID(i), $t.grid.hDiv);
 							$elem.parents("table.ui-search-table").find("td.ui-search-oper").children("a").attr("soper", so[i]).html(p.operands[so[i]]);
 						}
 					});
@@ -1158,17 +1150,11 @@ $.jgrid.extend({
 			},
 			toggleToolbar = function(){
 				var trow = $("tr.ui-search-toolbar",$t.grid.hDiv);
-				if($t.p.frozenColumns === true) {
-					$($t).jqGrid('destroyFrozenColumns');
-				}
 				if(trow.css("display") === 'none') {
 					trow.show();
 				} else {
 					trow.hide();
 				}
-				if($t.p.frozenColumns === true) {
-					$($t).jqGrid("setFrozenColumns");
-				}
 			},
 			buildRuleMenu = function( elem, left, top ){
 				$("#sopt_menu").remove();
@@ -1217,38 +1203,6 @@ $.jgrid.extend({
 						}
 					}
 				});
-			},
-			setToolbarFozenVal = function( ffields, soper, smultiselect, arcustom) {
-				var orgCol = $(".ui-search-toolbar", $t.grid.hDiv),
-					frozenCol = $(".ui-search-toolbar", $t.grid.fhDiv);
-				$.each(ffields, function(i,n){ 
-					// multiselect
-					// operations
-					if(p.searchOperators) {
-						var oper = soper[i];
-						if(oper) {
-							$(".ui-search-table .ui-search-oper [colname='userId']", orgCol).attr({'soper': oper}).text( p.operands[oper]);
-							$(".ui-search-table .ui-search-oper [colname='userId']", frozenCol).attr({'soper': oper}).text( p.operands[oper]);
-						}
-					}
-					// custom element
-					if( $.inArray(i, arcustom) > -1) {
-						var col = $.jgrid.getElemByAttrVal( $t.p.colModel, 'name', i );
-						if ( col && col.searchoptions ) {
-							var soptf = col.searchoptions || {};
-							if( $.jgrid.isFunction( soptf.custom_value ) ) {
-								var $elem = $("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(i), $t.grid.fhDiv ),
-								$elem2 = $("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(i), $t.grid.hDiv);
-
-								soptf.custom_value.call($t, $elem, "set", n);
-								soptf.custom_value.call($t, $elem2, "set", n);
-							}
- 						}
-					} else {
-						$("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(i), orgCol).val( n );
-						$("#gs_"+ $t.p.idPrefix + $.jgrid.jqID(i), frozenCol).val( n );
-					}
-				});
 			};
 			// create the row
 			var tr = $("<tr class='ui-search-toolbar' role='row'></tr>"),

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

@@ -636,6 +636,9 @@ $.jgrid.extend({
 							}
 							rp_ge[$t.p.id].processing=false;
 							try{$(':input:visible',frmgr)[0].focus();} catch (e){}
+						}, 
+						complete : function() {
+							rp_ge[$t.p.id].processing=false;
 						}
 					}, $.jgrid.ajaxOptions, rp_ge[$t.p.id].ajaxEditOptions );
 
@@ -1738,7 +1741,7 @@ $.jgrid.extend({
 							else {
 								if(ajaxOptions.url === "clientArray") {
 									postd = ajaxOptions.data;
-									ajaxOptions.success({status:200, statusText:''},'');
+									ajaxOptions.success(postdata,'',{status:200, statusText:''});
 								} else if( ajaxOptions.url === "storage") {
 									$($t).jqGrid('deleteStorageRecord', postdata)
 									.then(function(e){