jqgrid-jquery-rails 4.5.1.0 → 4.5.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/jqgrid-jquery-rails/version.rb +1 -1
- data/vendor/assets/javascripts/jquery.jqGrid.js +210 -222
- metadata +1 -1
    
        checksums.yaml
    CHANGED
    
    | @@ -1,7 +1,7 @@ | |
| 1 1 | 
             
            ---
         | 
| 2 2 | 
             
            SHA1:
         | 
| 3 | 
            -
              metadata.gz:  | 
| 4 | 
            -
              data.tar.gz:  | 
| 3 | 
            +
              metadata.gz: b5b9f3d87138099509b1150beadbefc50fb6dea2
         | 
| 4 | 
            +
              data.tar.gz: 711aca08a0156704ed0c7d7bccbd30903c2ef5dc
         | 
| 5 5 | 
             
            SHA512:
         | 
| 6 | 
            -
              metadata.gz:  | 
| 7 | 
            -
              data.tar.gz:  | 
| 6 | 
            +
              metadata.gz: d3130acebcb2d0f707a3b355b9abf02e102336d219d3fe75a4491f1157ff68aa364e20e0b5a47f94933979745d6df761b6c24e1fa94af246219a2faf9ef41df5
         | 
| 7 | 
            +
              data.tar.gz: adefb4c5b3dcc2847a3075f48f54051436c5cc58b8e6e95b47f314b621c314080d28c0472ab9671ebed20ac982a2fe463d81215aac3ecca64f74c7e0229532f0
         | 
    
        data/README.md
    CHANGED
    
    
| @@ -2,7 +2,7 @@ | |
| 2 2 | 
             
            // @compilation_level SIMPLE_OPTIMIZATIONS
         | 
| 3 3 |  | 
| 4 4 | 
             
            /**
         | 
| 5 | 
            -
             * @license jqGrid  4.5. | 
| 5 | 
            +
             * @license jqGrid  4.5.2 - jQuery Grid
         | 
| 6 6 | 
             
             * Copyright (c) 2008, Tony Tomov, tony@trirand.com
         | 
| 7 7 | 
             
             * Dual licensed under the MIT and GPL licenses
         | 
| 8 8 | 
             
             * http://www.opensource.org/licenses/mit-license.php
         | 
| @@ -17,7 +17,7 @@ | |
| 17 17 | 
             
            "use strict";
         | 
| 18 18 | 
             
            $.jgrid = $.jgrid || {};
         | 
| 19 19 | 
             
            $.extend($.jgrid,{
         | 
| 20 | 
            -
            	version : "4.5. | 
| 20 | 
            +
            	version : "4.5.2",
         | 
| 21 21 | 
             
            	htmlDecode : function(value){
         | 
| 22 22 | 
             
            		if(value && (value===' ' || value===' ' || (value.length===1 && value.charCodeAt(0)===160))) { return "";}
         | 
| 23 23 | 
             
            		return !value ? value : String(value).replace(/>/g, ">").replace(/</g, "<").replace(/"/g, '"').replace(/&/g, "&");		
         | 
| @@ -32,7 +32,7 @@ $.extend($.jgrid,{ | |
| 32 32 | 
             
            			return args[i];
         | 
| 33 33 | 
             
            		});
         | 
| 34 34 | 
             
            	},
         | 
| 35 | 
            -
            	msie : navigator.appName  | 
| 35 | 
            +
            	msie : navigator.appName === 'Microsoft Internet Explorer',
         | 
| 36 36 | 
             
            	msiever : function () {
         | 
| 37 37 | 
             
            		var rv = -1;
         | 
| 38 38 | 
             
            		var ua = navigator.userAgent;
         | 
| @@ -1987,7 +1987,7 @@ $.fn.jqGrid = function( pin ) { | |
| 1987 1987 | 
             
            				break;
         | 
| 1988 1988 | 
             
            				case "xmlstring":
         | 
| 1989 1989 | 
             
            					beginReq();
         | 
| 1990 | 
            -
            					dstr = typeof ts.p.datastr !== 'string' ? ts.p.datastr : $.parseXML(ts.p.datastr) | 
| 1990 | 
            +
            					dstr = typeof ts.p.datastr !== 'string' ? ts.p.datastr : $.parseXML(ts.p.datastr);
         | 
| 1991 1991 | 
             
            					addXmlData(dstr,ts.grid.bDiv);
         | 
| 1992 1992 | 
             
            					$(ts).triggerHandler("jqGridLoadComplete", [dstr]);
         | 
| 1993 1993 | 
             
            					if(lcf) {ts.p.loadComplete.call(ts,dstr);}
         | 
| @@ -2259,8 +2259,7 @@ $.fn.jqGrid = function( pin ) { | |
| 2259 2259 | 
             
            			if(ts.p.sortname !== index && idxcol) {ts.p.lastsort = idxcol;}
         | 
| 2260 2260 | 
             
            		},
         | 
| 2261 2261 | 
             
            		setColWidth = function () {
         | 
| 2262 | 
            -
            			var initwidth = 0, brd=$.jgrid.cell_width? 0: intNum(ts.p.cellLayout,0), vc=0, lvc, scw=intNum(ts.p.scrollOffset,0),cw,hs=false,aw,gw=0,
         | 
| 2263 | 
            -
            			cl = 0, cr;
         | 
| 2262 | 
            +
            			var initwidth = 0, brd=$.jgrid.cell_width? 0: intNum(ts.p.cellLayout,0), vc=0, lvc, scw=intNum(ts.p.scrollOffset,0),cw,hs=false,aw,gw=0,cr;
         | 
| 2264 2263 | 
             
            			$.each(ts.p.colModel, function() {
         | 
| 2265 2264 | 
             
            				if(this.hidden === undefined) {this.hidden=false;}
         | 
| 2266 2265 | 
             
            				if(ts.p.grouping && ts.p.autowidth) {
         | 
| @@ -2277,7 +2276,6 @@ $.fn.jqGrid = function( pin ) { | |
| 2277 2276 | 
             
            					} else {
         | 
| 2278 2277 | 
             
            						vc++;
         | 
| 2279 2278 | 
             
            					}
         | 
| 2280 | 
            -
            					cl++;
         | 
| 2281 2279 | 
             
            				}
         | 
| 2282 2280 | 
             
            			});
         | 
| 2283 2281 | 
             
            			if(isNaN(ts.p.width)) {
         | 
| @@ -3063,12 +3061,11 @@ $.jgrid.extend({ | |
| 3063 3061 | 
             
            		return resall || res;
         | 
| 3064 3062 | 
             
            	},
         | 
| 3065 3063 | 
             
            	delRowData : function(rowid) {
         | 
| 3066 | 
            -
            		var success = false, rowInd, ia | 
| 3064 | 
            +
            		var success = false, rowInd, ia;
         | 
| 3067 3065 | 
             
            		this.each(function() {
         | 
| 3068 3066 | 
             
            			var $t = this;
         | 
| 3069 3067 | 
             
            			rowInd = $t.rows.namedItem(rowid);
         | 
| 3070 3068 | 
             
            			if(!rowInd) {return false;}
         | 
| 3071 | 
            -
            				ri = rowInd.rowIndex;
         | 
| 3072 3069 | 
             
            				$(rowInd).remove();
         | 
| 3073 3070 | 
             
            				$t.p.records--;
         | 
| 3074 3071 | 
             
            				$t.p.reccount--;
         | 
| @@ -3408,8 +3405,7 @@ $.jgrid.extend({ | |
| 3408 3405 | 
             
            		return this.each(function(){
         | 
| 3409 3406 | 
             
            			if (!this.grid ) {return;}
         | 
| 3410 3407 | 
             
            			var $t = this, cw,
         | 
| 3411 | 
            -
            			initwidth = 0, brd=$.jgrid.cell_width ? 0: $t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0,
         | 
| 3412 | 
            -
            			cl = 0,cr;
         | 
| 3408 | 
            +
            			initwidth = 0, brd=$.jgrid.cell_width ? 0: $t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0, cr;
         | 
| 3413 3409 | 
             
            			if(typeof shrink !== 'boolean') {
         | 
| 3414 3410 | 
             
            				shrink=$t.p.shrinkToFit;
         | 
| 3415 3411 | 
             
            			}
         | 
| @@ -3438,7 +3434,6 @@ $.jgrid.extend({ | |
| 3438 3434 | 
             
            						} else {
         | 
| 3439 3435 | 
             
            							vc++;
         | 
| 3440 3436 | 
             
            						}
         | 
| 3441 | 
            -
            						cl++;
         | 
| 3442 3437 | 
             
            					}
         | 
| 3443 3438 | 
             
            				});
         | 
| 3444 3439 | 
             
            				if(vc  === 0) { return; }
         | 
| @@ -3858,7 +3853,7 @@ $.jgrid.extend({ | |
| 3858 3853 | 
             
            			}
         | 
| 3859 3854 | 
             
            			cm = $t.p.colModel[iCol];
         | 
| 3860 3855 | 
             
            			nm = cm.name;
         | 
| 3861 | 
            -
            			if (nm | 
| 3856 | 
            +
            			if (nm==='subgrid' || nm==='cb' || nm==='rn') {return;}
         | 
| 3862 3857 | 
             
            			cc = $("td:eq("+iCol+")",$t.rows[iRow]);
         | 
| 3863 3858 | 
             
            			if (cm.editable===true && ed===true && !cc.hasClass("not-editable-cell")) {
         | 
| 3864 3859 | 
             
            				if(parseInt($t.p.iCol,10)>=0  && parseInt($t.p.iRow,10)>=0) {
         | 
| @@ -3870,7 +3865,7 @@ $.jgrid.extend({ | |
| 3870 3865 | 
             
            				try {
         | 
| 3871 3866 | 
             
            					tmp =  $.unformat.call($t,cc,{rowId: $t.rows[iRow].id, colModel:cm},iCol);
         | 
| 3872 3867 | 
             
            				} catch (_) {
         | 
| 3873 | 
            -
            					tmp = ( cm.edittype && cm.edittype  | 
| 3868 | 
            +
            					tmp = ( cm.edittype && cm.edittype === 'textarea' ) ? $(cc).text() : $(cc).html();
         | 
| 3874 3869 | 
             
            				}
         | 
| 3875 3870 | 
             
            				if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); }
         | 
| 3876 3871 | 
             
            				if (!cm.edittype) {cm.edittype = "text";}
         | 
| @@ -3981,8 +3976,8 @@ $.jgrid.extend({ | |
| 3981 3976 | 
             
            								if (v===undefined) { throw "e2";} else { v2=v; }
         | 
| 3982 3977 | 
             
            							} else { throw "e1"; }
         | 
| 3983 3978 | 
             
            						} catch (e) {
         | 
| 3984 | 
            -
            							if (e | 
| 3985 | 
            -
            							if (e | 
| 3979 | 
            +
            							if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose); }
         | 
| 3980 | 
            +
            							if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose); }
         | 
| 3986 3981 | 
             
            							else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose); }
         | 
| 3987 3982 | 
             
            						}
         | 
| 3988 3983 | 
             
            						break;
         | 
| @@ -4003,7 +3998,7 @@ $.jgrid.extend({ | |
| 4003 3998 | 
             
            							if (!addpost) {addpost={};}
         | 
| 4004 3999 | 
             
            						}
         | 
| 4005 4000 | 
             
            						if( $("input.hasDatepicker",cc).length >0) { $("input.hasDatepicker",cc).datepicker('hide'); }
         | 
| 4006 | 
            -
            						if ($t.p.cellsubmit  | 
| 4001 | 
            +
            						if ($t.p.cellsubmit === 'remote') {
         | 
| 4007 4002 | 
             
            							if ($t.p.cellurl) {
         | 
| 4008 4003 | 
             
            								var postdata = {};
         | 
| 4009 4004 | 
             
            								if($t.p.autoencode) { v = $.jgrid.htmlEncode(v); }
         | 
| @@ -4024,7 +4019,7 @@ $.jgrid.extend({ | |
| 4024 4019 | 
             
            									complete: function (result, stat) {
         | 
| 4025 4020 | 
             
            										$("#lui_"+$t.p.id).hide();
         | 
| 4026 4021 | 
             
            										$t.grid.hDiv.loading = false;
         | 
| 4027 | 
            -
            										if (stat  | 
| 4022 | 
            +
            										if (stat === 'success') {
         | 
| 4028 4023 | 
             
            											var ret = $($t).triggerHandler("jqGridAfterSubmitCell", [$t, result, postdata.id, nm, v, iRow, iCol]) || [true, ''];
         | 
| 4029 4024 | 
             
            											if (ret[0] === true && $.isFunction($t.p.afterSubmitCell)) {
         | 
| 4030 4025 | 
             
            												ret = $t.p.afterSubmitCell.call($t, result,postdata.id,nm,v,iRow,iCol);
         | 
| @@ -4065,7 +4060,7 @@ $.jgrid.extend({ | |
| 4065 4060 | 
             
            								} catch (e) {}
         | 
| 4066 4061 | 
             
            							}
         | 
| 4067 4062 | 
             
            						}
         | 
| 4068 | 
            -
            						if ($t.p.cellsubmit  | 
| 4063 | 
            +
            						if ($t.p.cellsubmit === 'clientArray') {
         | 
| 4069 4064 | 
             
            							$(cc).empty();
         | 
| 4070 4065 | 
             
            							$($t).jqGrid("setCell",$t.rows[iRow].id,iCol, v2, false, false, true);
         | 
| 4071 4066 | 
             
            							$(cc).addClass("dirty-cell");
         | 
| @@ -4160,23 +4155,23 @@ $.jgrid.extend({ | |
| 4160 4155 | 
             
            			var selection = $("<div style='position:fixed;top:0px;width:1px;height:1px;' tabindex='0'><div tabindex='-1' style='width:1px;height:1px;' id='"+$t.p.knv+"'></div></div>"),
         | 
| 4161 4156 | 
             
            			i, kdir;
         | 
| 4162 4157 | 
             
            			function scrollGrid(iR, iC, tp){
         | 
| 4163 | 
            -
            				if (tp.substr(0,1) | 
| 4158 | 
            +
            				if (tp.substr(0,1)==='v') {
         | 
| 4164 4159 | 
             
            					var ch = $($t.grid.bDiv)[0].clientHeight,
         | 
| 4165 4160 | 
             
            					st = $($t.grid.bDiv)[0].scrollTop,
         | 
| 4166 4161 | 
             
            					nROT = $t.rows[iR].offsetTop+$t.rows[iR].clientHeight,
         | 
| 4167 4162 | 
             
            					pROT = $t.rows[iR].offsetTop;
         | 
| 4168 | 
            -
            					if(tp  | 
| 4163 | 
            +
            					if(tp === 'vd') {
         | 
| 4169 4164 | 
             
            						if(nROT >= ch) {
         | 
| 4170 4165 | 
             
            							$($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop + $t.rows[iR].clientHeight;
         | 
| 4171 4166 | 
             
            						}
         | 
| 4172 4167 | 
             
            					}
         | 
| 4173 | 
            -
            					if(tp  | 
| 4168 | 
            +
            					if(tp === 'vu'){
         | 
| 4174 4169 | 
             
            						if (pROT < st ) {
         | 
| 4175 4170 | 
             
            							$($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop - $t.rows[iR].clientHeight;
         | 
| 4176 4171 | 
             
            						}
         | 
| 4177 4172 | 
             
            					}
         | 
| 4178 4173 | 
             
            				}
         | 
| 4179 | 
            -
            				if(tp | 
| 4174 | 
            +
            				if(tp==='h') {
         | 
| 4180 4175 | 
             
            					var cw = $($t.grid.bDiv)[0].clientWidth,
         | 
| 4181 4176 | 
             
            					sl = $($t.grid.bDiv)[0].scrollLeft,
         | 
| 4182 4177 | 
             
            					nCOL = $t.rows[iR].cells[iC].offsetLeft+$t.rows[iR].cells[iC].clientWidth,
         | 
| @@ -4190,7 +4185,7 @@ $.jgrid.extend({ | |
| 4190 4185 | 
             
            			}
         | 
| 4191 4186 | 
             
            			function findNextVisible(iC,act){
         | 
| 4192 4187 | 
             
            				var ind, i;
         | 
| 4193 | 
            -
            				if(act  | 
| 4188 | 
            +
            				if(act === 'lft') {
         | 
| 4194 4189 | 
             
            					ind = iC+1;
         | 
| 4195 4190 | 
             
            					for (i=iC;i>=0;i--){
         | 
| 4196 4191 | 
             
            						if ($t.p.colModel[i].hidden !== true) {
         | 
| @@ -4199,7 +4194,7 @@ $.jgrid.extend({ | |
| 4199 4194 | 
             
            						}
         | 
| 4200 4195 | 
             
            					}
         | 
| 4201 4196 | 
             
            				}
         | 
| 4202 | 
            -
            				if(act  | 
| 4197 | 
            +
            				if(act === 'rgt') {
         | 
| 4203 4198 | 
             
            					ind = iC-1;
         | 
| 4204 4199 | 
             
            					for (i=iC; i<$t.p.colModel.length;i++){
         | 
| 4205 4200 | 
             
            						if ($t.p.colModel[i].hidden !== true) {
         | 
| @@ -4216,7 +4211,7 @@ $.jgrid.extend({ | |
| 4216 4211 | 
             
            			.focus()
         | 
| 4217 4212 | 
             
            			.keydown(function (e){
         | 
| 4218 4213 | 
             
            				kdir = e.keyCode;
         | 
| 4219 | 
            -
            				if($t.p.direction  | 
| 4214 | 
            +
            				if($t.p.direction === "rtl") {
         | 
| 4220 4215 | 
             
            					if(kdir===37) { kdir = 39;}
         | 
| 4221 4216 | 
             
            					else if (kdir===39) { kdir = 37; }
         | 
| 4222 4217 | 
             
            				}
         | 
| @@ -4271,7 +4266,7 @@ $.jgrid.extend({ | |
| 4271 4266 | 
             
            					$('td',this).each( function(i) {
         | 
| 4272 4267 | 
             
            						nm = $t.p.colModel[i].name;
         | 
| 4273 4268 | 
             
            						if ( nm !== 'cb' && nm !== 'subgrid') {
         | 
| 4274 | 
            -
            							if (mthd | 
| 4269 | 
            +
            							if (mthd==='dirty') {
         | 
| 4275 4270 | 
             
            								if ($(this).hasClass('dirty-cell')) {
         | 
| 4276 4271 | 
             
            									try {
         | 
| 4277 4272 | 
             
            										res[nm] = $.unformat.call($t,this,{rowId:$t.rows[j].id, colModel:$t.p.colModel[i]},i);
         | 
| @@ -4350,7 +4345,7 @@ $.extend($.jgrid,{ | |
| 4350 4345 | 
             
            		p = $.extend(true, {}, $.jgrid.jqModal || {}, p);
         | 
| 4351 4346 | 
             
            		var mw  = document.createElement('div'), rtlsup, self = this;
         | 
| 4352 4347 | 
             
            		css = $.extend({}, css || {});
         | 
| 4353 | 
            -
            		rtlsup = $(p.gbox).attr("dir")  | 
| 4348 | 
            +
            		rtlsup = $(p.gbox).attr("dir") === "rtl" ? true : false;
         | 
| 4354 4349 | 
             
            		mw.className= "ui-widget ui-widget-content ui-corner-all ui-jqdialog";
         | 
| 4355 4350 | 
             
            		mw.id = aIDs.themodal;
         | 
| 4356 4351 | 
             
            		var mh = document.createElement('div');
         | 
| @@ -4520,7 +4515,7 @@ $.extend($.jgrid,{ | |
| 4520 4515 | 
             
            		cnt += "</div>";
         | 
| 4521 4516 |  | 
| 4522 4517 | 
             
            		try {
         | 
| 4523 | 
            -
            			if($("#info_dialog").attr("aria-hidden")  | 
| 4518 | 
            +
            			if($("#info_dialog").attr("aria-hidden") === "false") {
         | 
| 4524 4519 | 
             
            				$.jgrid.hideModal("#info_dialog",{jqm:jm});
         | 
| 4525 4520 | 
             
            			}
         | 
| 4526 4521 | 
             
            			$("#info_dialog").remove();
         | 
| @@ -4604,7 +4599,7 @@ $.extend($.jgrid,{ | |
| 4604 4599 | 
             
            					if(!options.cols) { $(elem).css({width:"98%"});}
         | 
| 4605 4600 | 
             
            				} else if (!options.cols) { options.cols = 20; }
         | 
| 4606 4601 | 
             
            				if(!options.rows) { options.rows = 2; }
         | 
| 4607 | 
            -
            				if(vl | 
| 4602 | 
            +
            				if(vl===' ' || vl===' ' || (vl.length===1 && vl.charCodeAt(0)===160)) {vl="";}
         | 
| 4608 4603 | 
             
            				elem.value = vl;
         | 
| 4609 4604 | 
             
            				setAttributes(elem, options);
         | 
| 4610 4605 | 
             
            				$(elem).attr({"role":"textbox","multiline":"true"});
         | 
| @@ -4715,7 +4710,7 @@ $.extend($.jgrid,{ | |
| 4715 4710 | 
             
            							ov.setAttribute("role","option");
         | 
| 4716 4711 | 
             
            							ov.value = sv[0]; ov.innerHTML = sv[1];
         | 
| 4717 4712 | 
             
            							elem.appendChild(ov);
         | 
| 4718 | 
            -
            							if (!msl &&  ($.trim(sv[0])  | 
| 4713 | 
            +
            							if (!msl &&  ($.trim(sv[0]) === $.trim(vl) || $.trim(sv[1]) === $.trim(vl))) { ov.selected ="selected"; }
         | 
| 4719 4714 | 
             
            							if (msl && ($.inArray($.trim(sv[1]), ovm)>-1 || $.inArray($.trim(sv[0]), ovm)>-1)) {ov.selected ="selected";}
         | 
| 4720 4715 | 
             
            						}
         | 
| 4721 4716 | 
             
            					} else if (typeof options.value === 'object') {
         | 
| @@ -4726,7 +4721,7 @@ $.extend($.jgrid,{ | |
| 4726 4721 | 
             
            								ov.setAttribute("role","option");
         | 
| 4727 4722 | 
             
            								ov.value = key; ov.innerHTML = oSv[key];
         | 
| 4728 4723 | 
             
            								elem.appendChild(ov);
         | 
| 4729 | 
            -
            								if (!msl &&  ( $.trim(key)  | 
| 4724 | 
            +
            								if (!msl &&  ( $.trim(key) === $.trim(vl) || $.trim(oSv[key]) === $.trim(vl)) ) { ov.selected ="selected"; }
         | 
| 4730 4725 | 
             
            								if (msl && ($.inArray($.trim(oSv[key]),ovm)>-1 || $.inArray($.trim(key),ovm)>-1)) { ov.selected ="selected"; }
         | 
| 4731 4726 | 
             
            							}
         | 
| 4732 4727 | 
             
            						}
         | 
| @@ -4738,13 +4733,13 @@ $.extend($.jgrid,{ | |
| 4738 4733 | 
             
            			case "password" :
         | 
| 4739 4734 | 
             
            			case "button" :
         | 
| 4740 4735 | 
             
            				var role;
         | 
| 4741 | 
            -
            				if(eltype | 
| 4736 | 
            +
            				if(eltype==="button") { role = "button"; }
         | 
| 4742 4737 | 
             
            				else { role = "textbox"; }
         | 
| 4743 4738 | 
             
            				elem = document.createElement("input");
         | 
| 4744 4739 | 
             
            				elem.type = eltype;
         | 
| 4745 4740 | 
             
            				elem.value = vl;
         | 
| 4746 4741 | 
             
            				setAttributes(elem, options);
         | 
| 4747 | 
            -
            				if(eltype  | 
| 4742 | 
            +
            				if(eltype !== "button"){
         | 
| 4748 4743 | 
             
            					if(autowidth) {
         | 
| 4749 4744 | 
             
            						if(!options.size) { $(elem).css({width:"98%"}); }
         | 
| 4750 4745 | 
             
            					} else if (!options.size) { options.size = 20; }
         | 
| @@ -4772,8 +4767,8 @@ $.extend($.jgrid,{ | |
| 4772 4767 | 
             
            						throw "e1";
         | 
| 4773 4768 | 
             
            					}
         | 
| 4774 4769 | 
             
            				} catch (e) {
         | 
| 4775 | 
            -
            					if (e | 
| 4776 | 
            -
            					if (e | 
| 4770 | 
            +
            					if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.nodefined, $.jgrid.edit.bClose);}
         | 
| 4771 | 
            +
            					if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);}
         | 
| 4777 4772 | 
             
            					else { $.jgrid.info_dialog($.jgrid.errors.errcap,typeof e==="string"?e:e.message,$.jgrid.edit.bClose); }
         | 
| 4778 4773 | 
             
            				}
         | 
| 4779 4774 | 
             
            			break;
         | 
| @@ -4839,7 +4834,7 @@ $.extend($.jgrid,{ | |
| 4839 4834 | 
             
            			return false;
         | 
| 4840 4835 | 
             
            		}
         | 
| 4841 4836 | 
             
            			strDate = tsp[format[dln]].toString();
         | 
| 4842 | 
            -
            			if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]] | 
| 4837 | 
            +
            			if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]]===2 && tsp[format[dln]]>daysInFebruary(tsp[format[j]])) || tsp[format[dln]] > daysInMonth[tsp[format[mln]]]){
         | 
| 4843 4838 | 
             
            				return false;
         | 
| 4844 4839 | 
             
            			}
         | 
| 4845 4840 | 
             
            		return true;
         | 
| @@ -4920,7 +4915,7 @@ $.extend($.jgrid,{ | |
| 4920 4915 | 
             
            			if(edtrul.integer === true) {
         | 
| 4921 4916 | 
             
            				if( !(rqfield === false && $.jgrid.isEmpty(val)) ) {
         | 
| 4922 4917 | 
             
            					if(isNaN(val)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""]; }
         | 
| 4923 | 
            -
            					if ((val % 1 !== 0) || (val.indexOf('.')  | 
| 4918 | 
            +
            					if ((val % 1 !== 0) || (val.indexOf('.') !== -1)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""];}
         | 
| 4924 4919 | 
             
            				}
         | 
| 4925 4920 | 
             
            			}
         | 
| 4926 4921 | 
             
            			if(edtrul.date === true) {
         | 
| @@ -5309,7 +5304,7 @@ $.jgrid.extend({ | |
| 5309 5304 | 
             
            				var fs =  $('.ui-jqgrid-view').css('font-size') || '11px';
         | 
| 5310 5305 | 
             
            				var str = '<ul id="sopt_menu" class="ui-search-menu" role="menu" tabindex="0" style="font-size:'+fs+';left:'+left+'px;top:'+top+'px;">',
         | 
| 5311 5306 | 
             
            				selected = $(elem).attr("soper"), selclass,
         | 
| 5312 | 
            -
            				aoprs = [],  | 
| 5307 | 
            +
            				aoprs = [], ina;
         | 
| 5313 5308 | 
             
            				var i=0, nm =$(elem).attr("colname"),len = $t.p.colModel.length;
         | 
| 5314 5309 | 
             
            				while(i<len) {
         | 
| 5315 5310 | 
             
            					if($t.p.colModel[i].name === nm) {
         | 
| @@ -5354,7 +5349,7 @@ $.jgrid.extend({ | |
| 5354 5349 | 
             
            			var tr = $("<tr class='ui-search-toolbar' role='rowheader'></tr>");
         | 
| 5355 5350 | 
             
            			var timeoutHnd;
         | 
| 5356 5351 | 
             
            			$.each($t.p.colModel,function(){
         | 
| 5357 | 
            -
            				var cm=this, soptions, surl, self, select = "", sot="=", so,
         | 
| 5352 | 
            +
            				var cm=this, soptions, surl, self, select = "", sot="=", so, i,
         | 
| 5358 5353 | 
             
            				th = $("<th role='columnheader' class='ui-state-default ui-th-column ui-th-"+$t.p.direction+"'></th>"),
         | 
| 5359 5354 | 
             
            				thd = $("<div style='position:relative;height:100%;padding-right:0.3em;padding-left:0.3em;'></div>"),
         | 
| 5360 5355 | 
             
            				stbl = $("<table class='ui-search-table' cellspacing='0'><tr><td class='ui-search-oper'></td><td class='ui-search-input'></td></tr></table>");
         | 
| @@ -5365,7 +5360,7 @@ $.jgrid.extend({ | |
| 5365 5360 | 
             
            				if(this.search){
         | 
| 5366 5361 | 
             
            					if(p.searchOperators) {
         | 
| 5367 5362 | 
             
            						so  = (soptions.sopt) ? soptions.sopt[0] : cm.stype==='select' ?  'eq' : p.defaultSearch;
         | 
| 5368 | 
            -
            						for( | 
| 5363 | 
            +
            						for(i = 0;i<p.odata.length;i++) {
         | 
| 5369 5364 | 
             
            							if(p.odata[i].oper === so) {
         | 
| 5370 5365 | 
             
            								sot = p.operands[so] || "";
         | 
| 5371 5366 | 
             
            								break;
         | 
| @@ -5427,7 +5422,7 @@ $.jgrid.extend({ | |
| 5427 5422 | 
             
            								var elem = document.createElement("select");
         | 
| 5428 5423 | 
             
            								elem.style.width = "100%";
         | 
| 5429 5424 | 
             
            								$(elem).attr({name:cm.index || cm.name, id: "gs_"+cm.name});
         | 
| 5430 | 
            -
            								var  | 
| 5425 | 
            +
            								var sv, ov, key, k;
         | 
| 5431 5426 | 
             
            								if(typeof oSv === "string") {
         | 
| 5432 5427 | 
             
            									so = oSv.split(delim);
         | 
| 5433 5428 | 
             
            									for(k=0; k<so.length;k++){
         | 
| @@ -6979,7 +6974,7 @@ $.jgrid.extend({ | |
| 6979 6974 | 
             
            			onBeforeInit = $.isFunction(rp_ge[$t.p.id].beforeInitData) ? rp_ge[$t.p.id].beforeInitData : false,
         | 
| 6980 6975 | 
             
            			onInitializeForm = $.isFunction(rp_ge[$t.p.id].onInitializeForm) ? rp_ge[$t.p.id].onInitializeForm : false,
         | 
| 6981 6976 | 
             
            			showFrm = true,
         | 
| 6982 | 
            -
            			maxCols = 1, maxRows=0,	postdata,  | 
| 6977 | 
            +
            			maxCols = 1, maxRows=0,	postdata, diff, frmoper;
         | 
| 6983 6978 | 
             
            			frmgr = $.jgrid.jqID(frmgr);
         | 
| 6984 6979 | 
             
            			if (rowid === "new") {
         | 
| 6985 6980 | 
             
            				rowid = "_empty";
         | 
| @@ -7056,7 +7051,7 @@ $.jgrid.extend({ | |
| 7056 7051 | 
             
            				for (i =1; i<=maxcols;i++) {
         | 
| 7057 7052 | 
             
            					tmpl += tdtmpl;
         | 
| 7058 7053 | 
             
            				}
         | 
| 7059 | 
            -
            				if(rowid  | 
| 7054 | 
            +
            				if(rowid !== '_empty') {
         | 
| 7060 7055 | 
             
            					ind = $(obj).jqGrid("getInd",rowid);
         | 
| 7061 7056 | 
             
            				}
         | 
| 7062 7057 | 
             
            				$(obj.p.colModel).each( function(i) {
         | 
| @@ -7072,22 +7067,22 @@ $.jgrid.extend({ | |
| 7072 7067 | 
             
            						if(ind === false) {
         | 
| 7073 7068 | 
             
            							tmp = "";
         | 
| 7074 7069 | 
             
            						} else {
         | 
| 7075 | 
            -
            							if(nm  | 
| 7070 | 
            +
            							if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 7076 7071 | 
             
            								tmp = $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).text();
         | 
| 7077 7072 | 
             
            							} else {
         | 
| 7078 7073 | 
             
            								try {
         | 
| 7079 7074 | 
             
            									tmp =  $.unformat.call(obj, $("td[role='gridcell']:eq("+i+")",obj.rows[ind]),{rowId:rowid, colModel:this},i);
         | 
| 7080 7075 | 
             
            								} catch (_) {
         | 
| 7081 | 
            -
            									tmp =  (this.edittype && this.edittype  | 
| 7076 | 
            +
            									tmp =  (this.edittype && this.edittype === "textarea") ? $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).text() : $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).html();
         | 
| 7082 7077 | 
             
            								}
         | 
| 7083 | 
            -
            								if(!tmp || tmp  | 
| 7078 | 
            +
            								if(!tmp || tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';}
         | 
| 7084 7079 | 
             
            							}
         | 
| 7085 7080 | 
             
            						}
         | 
| 7086 7081 | 
             
            						var opt = $.extend({}, this.editoptions || {} ,{id:nm,name:nm}),
         | 
| 7087 7082 | 
             
            						frmopt = $.extend({}, {elmprefix:'',elmsuffix:'',rowabove:false,rowcontent:''}, this.formoptions || {}),
         | 
| 7088 7083 | 
             
            						rp = parseInt(frmopt.rowpos,10) || cnt+1,
         | 
| 7089 7084 | 
             
            						cp = parseInt((parseInt(frmopt.colpos,10) || 1)*2,10);
         | 
| 7090 | 
            -
            						if(rowid  | 
| 7085 | 
            +
            						if(rowid === "_empty" && opt.defaultValue ) {
         | 
| 7091 7086 | 
             
            							tmp = $.isFunction(opt.defaultValue) ? opt.defaultValue.call($t) : opt.defaultValue;
         | 
| 7092 7087 | 
             
            						}
         | 
| 7093 7088 | 
             
            						if(!this.edittype) {this.edittype = "text";}
         | 
| @@ -7134,7 +7129,7 @@ $.jgrid.extend({ | |
| 7134 7129 | 
             
            				var nm,cnt=0,tmp, fld,opt,vl,vlc;
         | 
| 7135 7130 | 
             
            				if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) {rp_ge[$t.p.id]._savedData = {};rp_ge[$t.p.id]._savedData[obj.p.id+"_id"]=rowid;}
         | 
| 7136 7131 | 
             
            				var cm = obj.p.colModel;
         | 
| 7137 | 
            -
            				if(rowid  | 
| 7132 | 
            +
            				if(rowid === '_empty') {
         | 
| 7138 7133 | 
             
            					$(cm).each(function(){
         | 
| 7139 7134 | 
             
            						nm = this.name;
         | 
| 7140 7135 | 
             
            						opt = $.extend({}, this.editoptions || {} );
         | 
| @@ -7143,7 +7138,7 @@ $.jgrid.extend({ | |
| 7143 7138 | 
             
            							vl = "";
         | 
| 7144 7139 | 
             
            							if(opt.defaultValue ) {
         | 
| 7145 7140 | 
             
            								vl = $.isFunction(opt.defaultValue) ? opt.defaultValue.call($t) : opt.defaultValue;
         | 
| 7146 | 
            -
            								if(fld[0].type | 
| 7141 | 
            +
            								if(fld[0].type==='checkbox') {
         | 
| 7147 7142 | 
             
            									vlc = vl.toLowerCase();
         | 
| 7148 7143 | 
             
            									if(vlc.search(/(false|f|0|no|n|off|undefined)/i)<0 && vlc!=="") {
         | 
| 7149 7144 | 
             
            										fld[0].checked = true;
         | 
| @@ -7155,11 +7150,11 @@ $.jgrid.extend({ | |
| 7155 7150 | 
             
            									}
         | 
| 7156 7151 | 
             
            								} else {fld.val(vl);}
         | 
| 7157 7152 | 
             
            							} else {
         | 
| 7158 | 
            -
            								if( fld[0].type | 
| 7153 | 
            +
            								if( fld[0].type==='checkbox' ) {
         | 
| 7159 7154 | 
             
            									fld[0].checked = false;
         | 
| 7160 7155 | 
             
            									fld[0].defaultChecked = false;
         | 
| 7161 7156 | 
             
            									vl = $(fld).attr("offval");
         | 
| 7162 | 
            -
            								} else if (fld[0].type && fld[0].type.substr(0,6) | 
| 7157 | 
            +
            								} else if (fld[0].type && fld[0].type.substr(0,6)==='select') {
         | 
| 7163 7158 | 
             
            									fld[0].selectedIndex = 0;
         | 
| 7164 7159 | 
             
            								} else {
         | 
| 7165 7160 | 
             
            									fld.val(vl);
         | 
| @@ -7177,13 +7172,13 @@ $.jgrid.extend({ | |
| 7177 7172 | 
             
            					nm = cm[i].name;
         | 
| 7178 7173 | 
             
            					// hidden fields are included in the form
         | 
| 7179 7174 | 
             
            					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn' && cm[i].editable===true) {
         | 
| 7180 | 
            -
            						if(nm  | 
| 7175 | 
            +
            						if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 7181 7176 | 
             
            							tmp = $(this).text();
         | 
| 7182 7177 | 
             
            						} else {
         | 
| 7183 7178 | 
             
            							try {
         | 
| 7184 7179 | 
             
            								tmp =  $.unformat.call(obj, $(this),{rowId:rowid, colModel:cm[i]},i);
         | 
| 7185 7180 | 
             
            							} catch (_) {
         | 
| 7186 | 
            -
            								tmp = cm[i].edittype | 
| 7181 | 
            +
            								tmp = cm[i].edittype==="textarea" ? $(this).text() : $(this).html();
         | 
| 7187 7182 | 
             
            							}
         | 
| 7188 7183 | 
             
            						}
         | 
| 7189 7184 | 
             
            						if($t.p.autoencode) {tmp = $.jgrid.htmlDecode(tmp);}
         | 
| @@ -7195,14 +7190,14 @@ $.jgrid.extend({ | |
| 7195 7190 | 
             
            							case "button" :
         | 
| 7196 7191 | 
             
            							case "image":
         | 
| 7197 7192 | 
             
            							case "textarea":
         | 
| 7198 | 
            -
            								if(tmp  | 
| 7193 | 
            +
            								if(tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';}
         | 
| 7199 7194 | 
             
            								$("#"+nm,"#"+fmid).val(tmp);
         | 
| 7200 7195 | 
             
            								break;
         | 
| 7201 7196 | 
             
            							case "select":
         | 
| 7202 7197 | 
             
            								var opv = tmp.split(",");
         | 
| 7203 7198 | 
             
            								opv = $.map(opv,function(n){return $.trim(n);});
         | 
| 7204 7199 | 
             
            								$("#"+nm+" option","#"+fmid).each(function(){
         | 
| 7205 | 
            -
            									if (!cm[i].editoptions.multiple && ($.trim(tmp)  | 
| 7200 | 
            +
            									if (!cm[i].editoptions.multiple && ($.trim(tmp) === $.trim($(this).text()) || opv[0] === $.trim($(this).text()) || opv[0] === $.trim($(this).val())) ){
         | 
| 7206 7201 | 
             
            										this.selected= true;
         | 
| 7207 7202 | 
             
            									} else if (cm[i].editoptions.multiple){
         | 
| 7208 7203 | 
             
            										if(  $.inArray($.trim($(this).text()), opv ) > -1 || $.inArray($.trim($(this).val()), opv ) > -1  ){
         | 
| @@ -7219,7 +7214,7 @@ $.jgrid.extend({ | |
| 7219 7214 | 
             
            								tmp = String(tmp);
         | 
| 7220 7215 | 
             
            								if(cm[i].editoptions && cm[i].editoptions.value) {
         | 
| 7221 7216 | 
             
            									var cb = cm[i].editoptions.value.split(":");
         | 
| 7222 | 
            -
            									if(cb[0]  | 
| 7217 | 
            +
            									if(cb[0] === tmp) {
         | 
| 7223 7218 | 
             
            										$("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']({"checked":true, "defaultChecked" : true});
         | 
| 7224 7219 | 
             
            									} else {
         | 
| 7225 7220 | 
             
            										$("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']({"checked":false, "defaultChecked" : false});
         | 
| @@ -7241,7 +7236,7 @@ $.jgrid.extend({ | |
| 7241 7236 | 
             
            										cm[i].editoptions.custom_value.call($t, $("#"+nm,"#"+fmid),'set',tmp);
         | 
| 7242 7237 | 
             
            									} else {throw "e1";}
         | 
| 7243 7238 | 
             
            								} catch (e) {
         | 
| 7244 | 
            -
            									if (e | 
| 7239 | 
            +
            									if (e==="e1") {$.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose);}
         | 
| 7245 7240 | 
             
            									else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose);}
         | 
| 7246 7241 | 
             
            								}
         | 
| 7247 7242 | 
             
            								break;
         | 
| @@ -7297,8 +7292,8 @@ $.jgrid.extend({ | |
| 7297 7292 | 
             
            					oper = opers.oper;
         | 
| 7298 7293 | 
             
            					idname = opers.id;
         | 
| 7299 7294 | 
             
            					// we add to pos data array the action - the name is oper
         | 
| 7300 | 
            -
            					postdata[oper] = ($.trim(postdata[$t.p.id+"_id"])  | 
| 7301 | 
            -
            					if(postdata[oper]  | 
| 7295 | 
            +
            					postdata[oper] = ($.trim(postdata[$t.p.id+"_id"]) === "_empty") ? opers.addoper : opers.editoper;
         | 
| 7296 | 
            +
            					if(postdata[oper] !== opers.addoper) {
         | 
| 7302 7297 | 
             
            						postdata[idname] = postdata[$t.p.id+"_id"];
         | 
| 7303 7298 | 
             
            					} else {
         | 
| 7304 7299 | 
             
            						// check to see if we have allredy this field in the form and if yes lieve it
         | 
| @@ -7307,16 +7302,16 @@ $.jgrid.extend({ | |
| 7307 7302 | 
             
            					delete postdata[$t.p.id+"_id"];
         | 
| 7308 7303 | 
             
            					postdata = $.extend(postdata,rp_ge[$t.p.id].editData,onCS);
         | 
| 7309 7304 | 
             
            					if($t.p.treeGrid === true)  {
         | 
| 7310 | 
            -
            						if(postdata[oper]  | 
| 7305 | 
            +
            						if(postdata[oper] === opers.addoper) {
         | 
| 7311 7306 | 
             
            						selr = $($t).jqGrid("getGridParam", 'selrow');
         | 
| 7312 | 
            -
            							var tr_par_id = $t.p.treeGridModel  | 
| 7307 | 
            +
            							var tr_par_id = $t.p.treeGridModel === 'adjacency' ? $t.p.treeReader.parent_id_field : 'parent_id';
         | 
| 7313 7308 | 
             
            							postdata[tr_par_id] = selr;
         | 
| 7314 7309 | 
             
            						}
         | 
| 7315 7310 | 
             
            						for(i in $t.p.treeReader){
         | 
| 7316 7311 | 
             
            							if($t.p.treeReader.hasOwnProperty(i)) {
         | 
| 7317 7312 | 
             
            								var itm = $t.p.treeReader[i];
         | 
| 7318 7313 | 
             
            								if(postdata.hasOwnProperty(itm)) {
         | 
| 7319 | 
            -
            									if(postdata[oper]  | 
| 7314 | 
            +
            									if(postdata[oper] === opers.addoper && i === 'parent_id_field') {continue;}
         | 
| 7320 7315 | 
             
            									delete postdata[itm];
         | 
| 7321 7316 | 
             
            								}
         | 
| 7322 7317 | 
             
            							}
         | 
| @@ -7504,7 +7499,7 @@ $.jgrid.extend({ | |
| 7504 7499 | 
             
            					$("#pData",frmtb+"_2").removeClass('ui-state-disabled');
         | 
| 7505 7500 | 
             
            				}
         | 
| 7506 7501 |  | 
| 7507 | 
            -
            				if (cr | 
| 7502 | 
            +
            				if (cr===totr) {
         | 
| 7508 7503 | 
             
            					$("#nData",frmtb+"_2").addClass('ui-state-disabled');
         | 
| 7509 7504 | 
             
            				} else if( posarr[1][cr+1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr+1])).hasClass('ui-state-disabled')) {
         | 
| 7510 7505 | 
             
            					$("#nData",frmtb+"_2").addClass('ui-state-disabled');
         | 
| @@ -7546,7 +7541,7 @@ $.jgrid.extend({ | |
| 7546 7541 | 
             
            				// filldata
         | 
| 7547 7542 | 
             
            				fillData(rowid,$t,frmgr);
         | 
| 7548 7543 | 
             
            				///
         | 
| 7549 | 
            -
            				if(rowid | 
| 7544 | 
            +
            				if(rowid==="_empty" || !rp_ge[$t.p.id].viewPagerButtons) {
         | 
| 7550 7545 | 
             
            					$("#pData, #nData",frmtb+"_2").hide();
         | 
| 7551 7546 | 
             
            				} else {
         | 
| 7552 7547 | 
             
            					$("#pData, #nData",frmtb+"_2").show();
         | 
| @@ -7602,7 +7597,7 @@ $.jgrid.extend({ | |
| 7602 7597 | 
             
            				// set the id.
         | 
| 7603 7598 | 
             
            				// use carefull only to change here colproperties.
         | 
| 7604 7599 | 
             
            				// create data
         | 
| 7605 | 
            -
            				var rtlb = $t.p.direction  | 
| 7600 | 
            +
            				var rtlb = $t.p.direction === "rtl" ? true :false,
         | 
| 7606 7601 | 
             
            				bp = rtlb ? "nData" : "pData",
         | 
| 7607 7602 | 
             
            				bn = rtlb ? "pData" : "nData";
         | 
| 7608 7603 | 
             
            				createData(rowid,$t,tbl,maxCols);
         | 
| @@ -7646,8 +7641,8 @@ $.jgrid.extend({ | |
| 7646 7641 | 
             
            				$("#"+$.jgrid.jqID(IDs.themodal)).keydown( function( e ) {
         | 
| 7647 7642 | 
             
            					var wkey = e.target;
         | 
| 7648 7643 | 
             
            					if ($("#"+frmgr).data("disabled")===true ) {return false;}//??
         | 
| 7649 | 
            -
            					if(rp_ge[$t.p.id].savekey[0] === true && e.which  | 
| 7650 | 
            -
            						if(wkey.tagName  | 
| 7644 | 
            +
            					if(rp_ge[$t.p.id].savekey[0] === true && e.which === rp_ge[$t.p.id].savekey[1]) { // save
         | 
| 7645 | 
            +
            						if(wkey.tagName !== "TEXTAREA") {
         | 
| 7651 7646 | 
             
            							$("#sData", frmtb+"_2").trigger("click");
         | 
| 7652 7647 | 
             
            							return false;
         | 
| 7653 7648 | 
             
            						}
         | 
| @@ -7658,12 +7653,12 @@ $.jgrid.extend({ | |
| 7658 7653 | 
             
            						return false;
         | 
| 7659 7654 | 
             
            					}
         | 
| 7660 7655 | 
             
            					if(rp_ge[$t.p.id].navkeys[0]===true) {
         | 
| 7661 | 
            -
            						if($("#id_g",frmtb).val()  | 
| 7662 | 
            -
            						if(e.which  | 
| 7656 | 
            +
            						if($("#id_g",frmtb).val() === "_empty") {return true;}
         | 
| 7657 | 
            +
            						if(e.which === rp_ge[$t.p.id].navkeys[1]){ //up
         | 
| 7663 7658 | 
             
            							$("#pData", frmtb+"_2").trigger("click");
         | 
| 7664 7659 | 
             
            							return false;
         | 
| 7665 7660 | 
             
            						}
         | 
| 7666 | 
            -
            						if(e.which  | 
| 7661 | 
            +
            						if(e.which === rp_ge[$t.p.id].navkeys[2]){ //down
         | 
| 7667 7662 | 
             
            							$("#nData", frmtb+"_2").trigger("click");
         | 
| 7668 7663 | 
             
            							return false;
         | 
| 7669 7664 | 
             
            						}
         | 
| @@ -7682,11 +7677,11 @@ $.jgrid.extend({ | |
| 7682 7677 | 
             
            				p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon);
         | 
| 7683 7678 | 
             
            				// beforeinitdata after creation of the form
         | 
| 7684 7679 | 
             
            				if(p.saveicon[0]===true) {
         | 
| 7685 | 
            -
            					$("#sData",frmtb+"_2").addClass(p.saveicon[1]  | 
| 7680 | 
            +
            					$("#sData",frmtb+"_2").addClass(p.saveicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 7686 7681 | 
             
            					.append("<span class='ui-icon "+p.saveicon[2]+"'></span>");
         | 
| 7687 7682 | 
             
            				}
         | 
| 7688 7683 | 
             
            				if(p.closeicon[0]===true) {
         | 
| 7689 | 
            -
            					$("#cData",frmtb+"_2").addClass(p.closeicon[1]  | 
| 7684 | 
            +
            					$("#cData",frmtb+"_2").addClass(p.closeicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 7690 7685 | 
             
            					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
         | 
| 7691 7686 | 
             
            				}
         | 
| 7692 7687 | 
             
            				if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) {
         | 
| @@ -7717,7 +7712,7 @@ $.jgrid.extend({ | |
| 7717 7712 | 
             
            				// here initform - only once
         | 
| 7718 7713 | 
             
            				$($t).triggerHandler("jqGridAddEditInitializeForm", [$("#"+frmgr), frmoper]);
         | 
| 7719 7714 | 
             
            				if(onInitializeForm) {onInitializeForm.call($t,$("#"+frmgr), frmoper);}
         | 
| 7720 | 
            -
            				if(rowid | 
| 7715 | 
            +
            				if(rowid==="_empty" || !rp_ge[$t.p.id].viewPagerButtons) {$("#pData,#nData",frmtb+"_2").hide();} else {$("#pData,#nData",frmtb+"_2").show();}
         | 
| 7721 7716 | 
             
            				$($t).triggerHandler("jqGridAddEditBeforeShowForm", [$("#"+frmgr), frmoper]);
         | 
| 7722 7717 | 
             
            				if(onBeforeShow) { onBeforeShow.call($t, $("#"+frmgr), frmoper);}
         | 
| 7723 7718 | 
             
            				$("#"+$.jgrid.jqID(IDs.themodal)).data("onClose",rp_ge[$t.p.id].onClose);
         | 
| @@ -7743,7 +7738,7 @@ $.jgrid.extend({ | |
| 7743 7738 | 
             
            					//ret[1] - msg if not succes
         | 
| 7744 7739 | 
             
            					//ret[2] - the id  that will be set if reload after submit false
         | 
| 7745 7740 | 
             
            					getFormData();
         | 
| 7746 | 
            -
            					if(postdata[$t.p.id+"_id"]  | 
| 7741 | 
            +
            					if(postdata[$t.p.id+"_id"] === "_empty")	{postIt();}
         | 
| 7747 7742 | 
             
            					else if(p.checkOnSubmit===true ) {
         | 
| 7748 7743 | 
             
            						diff = compareData(postdata,rp_ge[$t.p.id]._savedData);
         | 
| 7749 7744 | 
             
            						if(diff) {
         | 
| @@ -7861,7 +7856,7 @@ $.jgrid.extend({ | |
| 7861 7856 | 
             
            				tdtmpl2 = "<td class='CaptionTD form-view-label ui-widget-content'> </td><td class='DataTD form-view-data ui-widget-content'> </td>",
         | 
| 7862 7857 | 
             
            				fmtnum = ['integer','number','currency'],max1 =0, max2=0 ,maxw,setme, viewfld;
         | 
| 7863 7858 | 
             
            				for (i=1;i<=maxcols;i++) {
         | 
| 7864 | 
            -
            					tmpl += i  | 
| 7859 | 
            +
            					tmpl += i === 1 ? tdtmpl : tdtmpl2;
         | 
| 7865 7860 | 
             
            				}
         | 
| 7866 7861 | 
             
            				// find max number align rigth with property formatter
         | 
| 7867 7862 | 
             
            				$(obj.p.colModel).each( function() {
         | 
| @@ -7895,7 +7890,7 @@ $.jgrid.extend({ | |
| 7895 7890 | 
             
            						if(ind === false) {
         | 
| 7896 7891 | 
             
            							tmp = "";
         | 
| 7897 7892 | 
             
            						} else {
         | 
| 7898 | 
            -
            							if(nm  | 
| 7893 | 
            +
            							if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 7899 7894 | 
             
            								tmp = $("td:eq("+i+")",obj.rows[ind]).text();
         | 
| 7900 7895 | 
             
            							} else {
         | 
| 7901 7896 | 
             
            								tmp = $("td:eq("+i+")",obj.rows[ind]).html();
         | 
| @@ -7934,7 +7929,7 @@ $.jgrid.extend({ | |
| 7934 7929 | 
             
            				return retpos;
         | 
| 7935 7930 | 
             
            			}
         | 
| 7936 7931 | 
             
            			function fillData(rowid,obj){
         | 
| 7937 | 
            -
            				var nm, hc,cnt=0,tmp, | 
| 7932 | 
            +
            				var nm, hc,cnt=0,tmp,trv;
         | 
| 7938 7933 | 
             
            				trv = $(obj).jqGrid("getInd",rowid,true);
         | 
| 7939 7934 | 
             
            				if(!trv) {return;}
         | 
| 7940 7935 | 
             
            				$('td',trv).each( function(i) {
         | 
| @@ -7946,12 +7941,11 @@ $.jgrid.extend({ | |
| 7946 7941 | 
             
            						hc = obj.p.colModel[i].hidden === true ? true : false;
         | 
| 7947 7942 | 
             
            					}
         | 
| 7948 7943 | 
             
            					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') {
         | 
| 7949 | 
            -
            						if(nm  | 
| 7944 | 
            +
            						if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 7950 7945 | 
             
            							tmp = $(this).text();
         | 
| 7951 7946 | 
             
            						} else {
         | 
| 7952 7947 | 
             
            							tmp = $(this).html();
         | 
| 7953 7948 | 
             
            						}
         | 
| 7954 | 
            -
            						opt = $.extend({},obj.p.colModel[i].editoptions || {});
         | 
| 7955 7949 | 
             
            						nm = $.jgrid.jqID("v_"+nm);
         | 
| 7956 7950 | 
             
            						$("#"+nm+" span","#"+frmtb).html(tmp);
         | 
| 7957 7951 | 
             
            						if (hc) {$("#"+nm,"#"+frmtb).parents("tr:first").hide();}
         | 
| @@ -7969,7 +7963,7 @@ $.jgrid.extend({ | |
| 7969 7963 | 
             
            				} else {
         | 
| 7970 7964 | 
             
            					$("#pData","#"+frmtb+"_2").removeClass('ui-state-disabled');
         | 
| 7971 7965 | 
             
            				}
         | 
| 7972 | 
            -
            				if (cr | 
| 7966 | 
            +
            				if (cr===totr) {
         | 
| 7973 7967 | 
             
            					$("#nData","#"+frmtb+"_2").addClass('ui-state-disabled');
         | 
| 7974 7968 | 
             
            				} else if( posarr[1][cr+1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr+1])).hasClass('ui-state-disabled')) {
         | 
| 7975 7969 | 
             
            					$("#nData",frmtb+"_2").addClass('ui-state-disabled');
         | 
| @@ -8018,7 +8012,7 @@ $.jgrid.extend({ | |
| 8018 8012 | 
             
            				// set the id.
         | 
| 8019 8013 | 
             
            				$(frm).append(tbl);
         | 
| 8020 8014 | 
             
            				createData(rowid, $t, tbl, maxCols);
         | 
| 8021 | 
            -
            				var rtlb = $t.p.direction  | 
| 8015 | 
            +
            				var rtlb = $t.p.direction === "rtl" ? true :false,
         | 
| 8022 8016 | 
             
            				bp = rtlb ? "nData" : "pData",
         | 
| 8023 8017 | 
             
            				bn = rtlb ? "pData" : "nData",
         | 
| 8024 8018 |  | 
| @@ -8067,7 +8061,7 @@ $.jgrid.extend({ | |
| 8067 8061 | 
             
            				});
         | 
| 8068 8062 | 
             
            				p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon);
         | 
| 8069 8063 | 
             
            				if(p.closeicon[0]===true) {
         | 
| 8070 | 
            -
            					$("#cData","#"+frmtb+"_2").addClass(p.closeicon[1]  | 
| 8064 | 
            +
            					$("#cData","#"+frmtb+"_2").addClass(p.closeicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 8071 8065 | 
             
            					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
         | 
| 8072 8066 | 
             
            				}
         | 
| 8073 8067 | 
             
            				if($.isFunction(p.beforeShowForm)) {p.beforeShowForm.call($t,$("#"+frmgr));}
         | 
| @@ -8085,7 +8079,7 @@ $.jgrid.extend({ | |
| 8085 8079 | 
             
            					$("#FormError","#"+frmtb).hide();
         | 
| 8086 8080 | 
             
            					var npos = getCurrPos();
         | 
| 8087 8081 | 
             
            					npos[0] = parseInt(npos[0],10);
         | 
| 8088 | 
            -
            					if(npos[0]  | 
| 8082 | 
            +
            					if(npos[0] !== -1 && npos[1][npos[0]+1]) {
         | 
| 8089 8083 | 
             
            						if($.isFunction(p.onclickPgButtons)) {
         | 
| 8090 8084 | 
             
            							p.onclickPgButtons.call($t,'next',$("#"+frmgr),npos[1][npos[0]]);
         | 
| 8091 8085 | 
             
            						}
         | 
| @@ -8102,7 +8096,7 @@ $.jgrid.extend({ | |
| 8102 8096 | 
             
            				$("#pData", "#"+frmtb+"_2").click(function(){
         | 
| 8103 8097 | 
             
            					$("#FormError","#"+frmtb).hide();
         | 
| 8104 8098 | 
             
            					var ppos = getCurrPos();
         | 
| 8105 | 
            -
            					if(ppos[0]  | 
| 8099 | 
            +
            					if(ppos[0] !== -1 && ppos[1][ppos[0]-1]) {
         | 
| 8106 8100 | 
             
            						if($.isFunction(p.onclickPgButtons)) {
         | 
| 8107 8101 | 
             
            							p.onclickPgButtons.call($t,'prev',$("#"+frmgr),ppos[1][ppos[0]]);
         | 
| 8108 8102 | 
             
            						}
         | 
| @@ -8215,11 +8209,11 @@ $.jgrid.extend({ | |
| 8215 8209 | 
             
            				p.delicon = $.extend([true,"left","ui-icon-scissors"],rp_ge[$t.p.id].delicon);
         | 
| 8216 8210 | 
             
            				p.cancelicon = $.extend([true,"left","ui-icon-cancel"],rp_ge[$t.p.id].cancelicon);
         | 
| 8217 8211 | 
             
            				if(p.delicon[0]===true) {
         | 
| 8218 | 
            -
            					$("#dData","#"+dtbl+"_2").addClass(p.delicon[1]  | 
| 8212 | 
            +
            					$("#dData","#"+dtbl+"_2").addClass(p.delicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 8219 8213 | 
             
            					.append("<span class='ui-icon "+p.delicon[2]+"'></span>");
         | 
| 8220 8214 | 
             
            				}
         | 
| 8221 8215 | 
             
            				if(p.cancelicon[0]===true) {
         | 
| 8222 | 
            -
            					$("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1]  | 
| 8216 | 
            +
            					$("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 8223 8217 | 
             
            					.append("<span class='ui-icon "+p.cancelicon[2]+"'></span>");
         | 
| 8224 8218 | 
             
            				}
         | 
| 8225 8219 | 
             
            				$("#dData","#"+dtbl+"_2").click(function(){
         | 
| @@ -8268,7 +8262,7 @@ $.jgrid.extend({ | |
| 8268 8262 | 
             
            									$("#DelError>td","#"+dtbl).html(ret[1]);
         | 
| 8269 8263 | 
             
            									$("#DelError","#"+dtbl).show();
         | 
| 8270 8264 | 
             
            								} else {
         | 
| 8271 | 
            -
            									if(rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype  | 
| 8265 | 
            +
            									if(rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype !== "local") {
         | 
| 8272 8266 | 
             
            										$($t).trigger("reloadGrid");
         | 
| 8273 8267 | 
             
            									} else {
         | 
| 8274 8268 | 
             
            										if($t.p.treeGrid===true){
         | 
| @@ -8419,7 +8413,7 @@ $.jgrid.extend({ | |
| 8419 8413 | 
             
            				if(i===0) {
         | 
| 8420 8414 | 
             
            					pgid = elem;
         | 
| 8421 8415 | 
             
            					elemids = $t.p.id;
         | 
| 8422 | 
            -
            					if(pgid  | 
| 8416 | 
            +
            					if(pgid === $t.p.toppager) {
         | 
| 8423 8417 | 
             
            						elemids += "_top";
         | 
| 8424 8418 | 
             
            						clone = 1;
         | 
| 8425 8419 | 
             
            					}
         | 
| @@ -8427,7 +8421,7 @@ $.jgrid.extend({ | |
| 8427 8421 | 
             
            					pgid = $t.p.toppager;
         | 
| 8428 8422 | 
             
            					elemids = $t.p.id+"_top";
         | 
| 8429 8423 | 
             
            				}
         | 
| 8430 | 
            -
            				if($t.p.direction  | 
| 8424 | 
            +
            				if($t.p.direction === "rtl") {$(navtbl).attr("dir","rtl").css("float","right");}
         | 
| 8431 8425 | 
             
            				if (o.add) {
         | 
| 8432 8426 | 
             
            					pAdd = pAdd || {};
         | 
| 8433 8427 | 
             
            					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
         | 
| @@ -8615,13 +8609,13 @@ $.jgrid.extend({ | |
| 8615 8609 | 
             
            			if (findnav) {
         | 
| 8616 8610 | 
             
            				if( p.id && $("#"+$.jgrid.jqID(p.id), findnav)[0] !== undefined )  {return;}
         | 
| 8617 8611 | 
             
            				var tbd = $("<td></td>");
         | 
| 8618 | 
            -
            				if(p.buttonicon.toString().toUpperCase()  | 
| 8612 | 
            +
            				if(p.buttonicon.toString().toUpperCase() === "NONE") {
         | 
| 8619 8613 | 
             
                                $(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'>"+p.caption+"</div>");
         | 
| 8620 8614 | 
             
            				} else	{
         | 
| 8621 8615 | 
             
            					$(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'><span class='ui-icon "+p.buttonicon+"'></span>"+p.caption+"</div>");
         | 
| 8622 8616 | 
             
            				}
         | 
| 8623 8617 | 
             
            				if(p.id) {$(tbd).attr("id",p.id);}
         | 
| 8624 | 
            -
            				if(p.position | 
| 8618 | 
            +
            				if(p.position==='first'){
         | 
| 8625 8619 | 
             
            					if(findnav.rows[0].cells.length ===0 ) {
         | 
| 8626 8620 | 
             
            						$("tr",findnav).append(tbd);
         | 
| 8627 8621 | 
             
            					} else {
         | 
| @@ -8709,8 +8703,8 @@ $.jgrid.extend({ | |
| 8709 8703 | 
             
            			$.each(fields, function(i, field){
         | 
| 8710 8704 | 
             
            				griddata[field.name] = field.value;
         | 
| 8711 8705 | 
             
            			});
         | 
| 8712 | 
            -
            			if(mode | 
| 8713 | 
            -
            			else if(mode | 
| 8706 | 
            +
            			if(mode==='add') {$($t).jqGrid("addRowData",rowid,griddata, position);}
         | 
| 8707 | 
            +
            			else if(mode==='set') {$($t).jqGrid("setRowData",rowid,griddata);}
         | 
| 8714 8708 | 
             
            		});
         | 
| 8715 8709 | 
             
            	}
         | 
| 8716 8710 | 
             
            });
         | 
| @@ -9146,7 +9140,7 @@ $.jgrid.extend({ | |
| 9146 9140 | 
             
            			var res = funcs[fn]();
         | 
| 9147 9141 |  | 
| 9148 9142 | 
             
            			if (round != null) {
         | 
| 9149 | 
            -
            				if (roundType  | 
| 9143 | 
            +
            				if (roundType === 'fixed') {
         | 
| 9150 9144 | 
             
            					res = res.toFixed(round);
         | 
| 9151 9145 | 
             
            				} else {
         | 
| 9152 9146 | 
             
            					var mul = Math.pow(10, round);
         | 
| @@ -9428,7 +9422,7 @@ $.jgrid.extend({ | |
| 9428 9422 | 
             
            			ind = $($t).jqGrid("getInd",rowid,true);
         | 
| 9429 9423 | 
             
            			if( ind === false ) {return;}
         | 
| 9430 9424 | 
             
            			editable = $(ind).attr("editable") || "0";
         | 
| 9431 | 
            -
            			if (editable  | 
| 9425 | 
            +
            			if (editable === "0" && !$(ind).hasClass("not-editable-row")) {
         | 
| 9432 9426 | 
             
            				cm = $t.p.colModel;
         | 
| 9433 9427 | 
             
            				$('td[role="gridcell"]',ind).each( function(i) {
         | 
| 9434 9428 | 
             
            					nm = cm[i].name;
         | 
| @@ -10365,7 +10359,7 @@ $.jgrid.extend({ | |
| 10365 10359 | 
             
            						// drag and drop does not insert tr in table, when the table has no rows
         | 
| 10366 10360 | 
             
            						// we try to insert new empty row on the target(s)
         | 
| 10367 10361 | 
             
            						for (i=0;i<$.data($t,"dnd").connectWith.length;i++){
         | 
| 10368 | 
            -
            							if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount')  | 
| 10362 | 
            +
            							if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount') === 0 ){
         | 
| 10369 10363 | 
             
            								$($.data($t,"dnd").connectWith[i]).jqGrid('addRowData','jqg_empty_row',{});
         | 
| 10370 10364 | 
             
            							}
         | 
| 10371 10365 | 
             
            						}
         | 
| @@ -10473,7 +10467,7 @@ $.jgrid.extend({ | |
| 10473 10467 | 
             
            		opts.connectWith = $.map(opts.connectWith,function(n){return $.trim(n);});
         | 
| 10474 10468 | 
             
            		$.data($t,"dnd",opts);
         | 
| 10475 10469 |  | 
| 10476 | 
            -
            		if($t.p.reccount  | 
| 10470 | 
            +
            		if($t.p.reccount !== 0 && !$t.p.jqgdnd) {
         | 
| 10477 10471 | 
             
            			updateDnD();
         | 
| 10478 10472 | 
             
            		}
         | 
| 10479 10473 | 
             
            		$t.p.jqgdnd = true;
         | 
| @@ -10952,7 +10946,7 @@ $.jgrid.extend({ | |
| 10952 10946 | 
             
            				var ind = $.jgrid.stripPref($t.p.idPrefix, $t.rows[i].id), dind = $t.p._index[ind], expan;
         | 
| 10953 10947 | 
             
            				ldat = $t.p.data[dind];
         | 
| 10954 10948 | 
             
            				//$t.rows[i].level = ldat[level];
         | 
| 10955 | 
            -
            				if($t.p.treeGridModel  | 
| 10949 | 
            +
            				if($t.p.treeGridModel === 'nested') {
         | 
| 10956 10950 | 
             
            					if(!ldat[isLeaf]) {
         | 
| 10957 10951 | 
             
            					lft = parseInt(ldat[$t.p.treeReader.left_field],10);
         | 
| 10958 10952 | 
             
            					rgt = parseInt(ldat[$t.p.treeReader.right_field],10);
         | 
| @@ -10973,17 +10967,17 @@ $.jgrid.extend({ | |
| 10973 10967 | 
             
            					lftpos = curLevel -1;
         | 
| 10974 10968 | 
             
            				}
         | 
| 10975 10969 | 
             
            				twrap = "<div class='tree-wrap tree-wrap-"+$t.p.direction+"' style='width:"+(ident*18)+"px;'>";
         | 
| 10976 | 
            -
            				twrap += "<div style='"+($t.p.direction | 
| 10970 | 
            +
            				twrap += "<div style='"+($t.p.direction==="rtl" ? "right:" : "left:")+(lftpos*18)+"px;' class='ui-icon ";
         | 
| 10977 10971 |  | 
| 10978 10972 |  | 
| 10979 10973 | 
             
            				if(ldat[loaded] !== undefined) {
         | 
| 10980 | 
            -
            					if(ldat[loaded] | 
| 10974 | 
            +
            					if(ldat[loaded]==="true" || ldat[loaded]===true) {
         | 
| 10981 10975 | 
             
            						ldat[loaded] = true;
         | 
| 10982 10976 | 
             
            					} else {
         | 
| 10983 10977 | 
             
            						ldat[loaded] = false;
         | 
| 10984 10978 | 
             
            					}
         | 
| 10985 10979 | 
             
            				}
         | 
| 10986 | 
            -
            				if(ldat[isLeaf]  | 
| 10980 | 
            +
            				if(ldat[isLeaf] === "true" || ldat[isLeaf] === true) {
         | 
| 10987 10981 | 
             
            					twrap += ((ldat[icon] !== undefined && ldat[icon] !== "") ? ldat[icon] : $t.p.treeIcons.leaf)+" tree-leaf treeclick";
         | 
| 10988 10982 | 
             
            					ldat[isLeaf] = true;
         | 
| 10989 10983 | 
             
            					lf="leaf";
         | 
| @@ -10991,7 +10985,7 @@ $.jgrid.extend({ | |
| 10991 10985 | 
             
            					ldat[isLeaf] = false;
         | 
| 10992 10986 | 
             
            					lf="";
         | 
| 10993 10987 | 
             
            				}
         | 
| 10994 | 
            -
            				ldat[expanded] = ((ldat[expanded]  | 
| 10988 | 
            +
            				ldat[expanded] = ((ldat[expanded] === "true" || ldat[expanded] === true) ? true : false) && (ldat[loaded] || ldat[loaded] === undefined);
         | 
| 10995 10989 | 
             
            				if(ldat[expanded] === false) {
         | 
| 10996 10990 | 
             
            					twrap += ((ldat[isLeaf] === true) ? "'" : $t.p.treeIcons.plus+" tree-plus treeclick'");
         | 
| 10997 10991 | 
             
            				} else {
         | 
| @@ -11062,9 +11056,9 @@ $.jgrid.extend({ | |
| 11062 11056 | 
             
            			if($t.p.rowTotal === null ) { $t.p.rowNum = 10000; }
         | 
| 11063 11057 | 
             
            			$t.p.multiselect = false;$t.p.rowList = [];
         | 
| 11064 11058 | 
             
            			$t.p.expColInd = 0;
         | 
| 11065 | 
            -
            			pico = 'ui-icon-triangle-1-' + ($t.p.direction | 
| 11059 | 
            +
            			pico = 'ui-icon-triangle-1-' + ($t.p.direction==="rtl" ? 'w' : 'e');
         | 
| 11066 11060 | 
             
            			$t.p.treeIcons = $.extend({plus:pico,minus:'ui-icon-triangle-1-s',leaf:'ui-icon-radio-off'},$t.p.treeIcons || {});
         | 
| 11067 | 
            -
            			if($t.p.treeGridModel  | 
| 11061 | 
            +
            			if($t.p.treeGridModel === 'nested') {
         | 
| 11068 11062 | 
             
            				$t.p.treeReader = $.extend({
         | 
| 11069 11063 | 
             
            					level_field: "level",
         | 
| 11070 11064 | 
             
            					left_field:"lft",
         | 
| @@ -11074,7 +11068,7 @@ $.jgrid.extend({ | |
| 11074 11068 | 
             
            					loaded: "loaded",
         | 
| 11075 11069 | 
             
            					icon_field: "icon"
         | 
| 11076 11070 | 
             
            				},$t.p.treeReader);
         | 
| 11077 | 
            -
            			} else if($t.p.treeGridModel  | 
| 11071 | 
            +
            			} else if($t.p.treeGridModel === 'adjacency') {
         | 
| 11078 11072 | 
             
            				$t.p.treeReader = $.extend({
         | 
| 11079 11073 | 
             
            						level_field: "level",
         | 
| 11080 11074 | 
             
            						parent_id_field: "parent",
         | 
| @@ -11087,14 +11081,14 @@ $.jgrid.extend({ | |
| 11087 11081 | 
             
            			for ( key in $t.p.colModel){
         | 
| 11088 11082 | 
             
            				if($t.p.colModel.hasOwnProperty(key)) {
         | 
| 11089 11083 | 
             
            					nm = $t.p.colModel[key].name;
         | 
| 11090 | 
            -
            					if( nm  | 
| 11084 | 
            +
            					if( nm === $t.p.ExpandColumn && !ecol ) {
         | 
| 11091 11085 | 
             
            						ecol = true;
         | 
| 11092 11086 | 
             
            						$t.p.expColInd = i;
         | 
| 11093 11087 | 
             
            					}
         | 
| 11094 11088 | 
             
            					i++;
         | 
| 11095 11089 | 
             
            					//
         | 
| 11096 11090 | 
             
            					for(tkey in $t.p.treeReader) {
         | 
| 11097 | 
            -
            						if($t.p.treeReader.hasOwnProperty(tkey) && $t.p.treeReader[tkey]  | 
| 11091 | 
            +
            						if($t.p.treeReader.hasOwnProperty(tkey) && $t.p.treeReader[tkey] === nm) {
         | 
| 11098 11092 | 
             
            							dupcols.push(nm);
         | 
| 11099 11093 | 
             
            						}
         | 
| 11100 11094 | 
             
            					}
         | 
| @@ -11162,7 +11156,7 @@ $.jgrid.extend({ | |
| 11162 11156 | 
             
            				case 'adjacency' :
         | 
| 11163 11157 | 
             
            					var parent_id = $t.p.treeReader.parent_id_field;
         | 
| 11164 11158 | 
             
            					$($t.p.data).each(function(){
         | 
| 11165 | 
            -
            						if(this[parent_id] === null || String(this[parent_id]).toLowerCase()  | 
| 11159 | 
            +
            						if(this[parent_id] === null || String(this[parent_id]).toLowerCase() === "null") {
         | 
| 11166 11160 | 
             
            							result.push(this);
         | 
| 11167 11161 | 
             
            						}
         | 
| 11168 11162 | 
             
            					});
         | 
| @@ -11356,14 +11350,14 @@ $.jgrid.extend({ | |
| 11356 11350 | 
             
            					$("div.treeclick",rc1).removeClass(this.p.treeIcons.plus+" tree-plus").addClass(this.p.treeIcons.minus+" tree-minus");
         | 
| 11357 11351 | 
             
            					this.p.treeANode = rc1.rowIndex;
         | 
| 11358 11352 | 
             
            					this.p.datatype = this.p.treedatatype;
         | 
| 11359 | 
            -
            					if(this.p.treeGridModel  | 
| 11353 | 
            +
            					if(this.p.treeGridModel === 'nested') {
         | 
| 11360 11354 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:id,n_left:rc[lft],n_right:rc[rgt],n_level:rc[level]}});
         | 
| 11361 11355 | 
             
            					} else {
         | 
| 11362 11356 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:id,parentid:rc[parent],n_level:rc[level]}} );
         | 
| 11363 11357 | 
             
            					}
         | 
| 11364 11358 | 
             
            					$(this).trigger("reloadGrid");
         | 
| 11365 11359 | 
             
            					rc[loaded] = true;
         | 
| 11366 | 
            -
            					if(this.p.treeGridModel  | 
| 11360 | 
            +
            					if(this.p.treeGridModel === 'nested') {
         | 
| 11367 11361 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:'',n_left:'',n_right:'',n_level:''}});
         | 
| 11368 11362 | 
             
            					} else {
         | 
| 11369 11363 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:'',parentid:'',n_level:''}}); 
         | 
| @@ -12224,7 +12218,7 @@ hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function() | |
| 12224 12218 | 
             
            // @compilation_level SIMPLE_OPTIMIZATIONS
         | 
| 12225 12219 |  | 
| 12226 12220 | 
             
            /**
         | 
| 12227 | 
            -
             * @license jqGrid  4.5. | 
| 12221 | 
            +
             * @license jqGrid  4.5.2 - jQuery Grid
         | 
| 12228 12222 | 
             
             * Copyright (c) 2008, Tony Tomov, tony@trirand.com
         | 
| 12229 12223 | 
             
             * Dual licensed under the MIT and GPL licenses
         | 
| 12230 12224 | 
             
             * http://www.opensource.org/licenses/mit-license.php
         | 
| @@ -12239,7 +12233,7 @@ hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function() | |
| 12239 12233 | 
             
            "use strict";
         | 
| 12240 12234 | 
             
            $.jgrid = $.jgrid || {};
         | 
| 12241 12235 | 
             
            $.extend($.jgrid,{
         | 
| 12242 | 
            -
            	version : "4.5. | 
| 12236 | 
            +
            	version : "4.5.2",
         | 
| 12243 12237 | 
             
            	htmlDecode : function(value){
         | 
| 12244 12238 | 
             
            		if(value && (value===' ' || value===' ' || (value.length===1 && value.charCodeAt(0)===160))) { return "";}
         | 
| 12245 12239 | 
             
            		return !value ? value : String(value).replace(/>/g, ">").replace(/</g, "<").replace(/"/g, '"').replace(/&/g, "&");		
         | 
| @@ -12254,7 +12248,7 @@ $.extend($.jgrid,{ | |
| 12254 12248 | 
             
            			return args[i];
         | 
| 12255 12249 | 
             
            		});
         | 
| 12256 12250 | 
             
            	},
         | 
| 12257 | 
            -
            	msie : navigator.appName  | 
| 12251 | 
            +
            	msie : navigator.appName === 'Microsoft Internet Explorer',
         | 
| 12258 12252 | 
             
            	msiever : function () {
         | 
| 12259 12253 | 
             
            		var rv = -1;
         | 
| 12260 12254 | 
             
            		var ua = navigator.userAgent;
         | 
| @@ -14209,7 +14203,7 @@ $.fn.jqGrid = function( pin ) { | |
| 14209 14203 | 
             
            				break;
         | 
| 14210 14204 | 
             
            				case "xmlstring":
         | 
| 14211 14205 | 
             
            					beginReq();
         | 
| 14212 | 
            -
            					dstr = typeof ts.p.datastr !== 'string' ? ts.p.datastr : $.parseXML(ts.p.datastr) | 
| 14206 | 
            +
            					dstr = typeof ts.p.datastr !== 'string' ? ts.p.datastr : $.parseXML(ts.p.datastr);
         | 
| 14213 14207 | 
             
            					addXmlData(dstr,ts.grid.bDiv);
         | 
| 14214 14208 | 
             
            					$(ts).triggerHandler("jqGridLoadComplete", [dstr]);
         | 
| 14215 14209 | 
             
            					if(lcf) {ts.p.loadComplete.call(ts,dstr);}
         | 
| @@ -14481,8 +14475,7 @@ $.fn.jqGrid = function( pin ) { | |
| 14481 14475 | 
             
            			if(ts.p.sortname !== index && idxcol) {ts.p.lastsort = idxcol;}
         | 
| 14482 14476 | 
             
            		},
         | 
| 14483 14477 | 
             
            		setColWidth = function () {
         | 
| 14484 | 
            -
            			var initwidth = 0, brd=$.jgrid.cell_width? 0: intNum(ts.p.cellLayout,0), vc=0, lvc, scw=intNum(ts.p.scrollOffset,0),cw,hs=false,aw,gw=0,
         | 
| 14485 | 
            -
            			cl = 0, cr;
         | 
| 14478 | 
            +
            			var initwidth = 0, brd=$.jgrid.cell_width? 0: intNum(ts.p.cellLayout,0), vc=0, lvc, scw=intNum(ts.p.scrollOffset,0),cw,hs=false,aw,gw=0,cr;
         | 
| 14486 14479 | 
             
            			$.each(ts.p.colModel, function() {
         | 
| 14487 14480 | 
             
            				if(this.hidden === undefined) {this.hidden=false;}
         | 
| 14488 14481 | 
             
            				if(ts.p.grouping && ts.p.autowidth) {
         | 
| @@ -14499,7 +14492,6 @@ $.fn.jqGrid = function( pin ) { | |
| 14499 14492 | 
             
            					} else {
         | 
| 14500 14493 | 
             
            						vc++;
         | 
| 14501 14494 | 
             
            					}
         | 
| 14502 | 
            -
            					cl++;
         | 
| 14503 14495 | 
             
            				}
         | 
| 14504 14496 | 
             
            			});
         | 
| 14505 14497 | 
             
            			if(isNaN(ts.p.width)) {
         | 
| @@ -15285,12 +15277,11 @@ $.jgrid.extend({ | |
| 15285 15277 | 
             
            		return resall || res;
         | 
| 15286 15278 | 
             
            	},
         | 
| 15287 15279 | 
             
            	delRowData : function(rowid) {
         | 
| 15288 | 
            -
            		var success = false, rowInd, ia | 
| 15280 | 
            +
            		var success = false, rowInd, ia;
         | 
| 15289 15281 | 
             
            		this.each(function() {
         | 
| 15290 15282 | 
             
            			var $t = this;
         | 
| 15291 15283 | 
             
            			rowInd = $t.rows.namedItem(rowid);
         | 
| 15292 15284 | 
             
            			if(!rowInd) {return false;}
         | 
| 15293 | 
            -
            				ri = rowInd.rowIndex;
         | 
| 15294 15285 | 
             
            				$(rowInd).remove();
         | 
| 15295 15286 | 
             
            				$t.p.records--;
         | 
| 15296 15287 | 
             
            				$t.p.reccount--;
         | 
| @@ -15630,8 +15621,7 @@ $.jgrid.extend({ | |
| 15630 15621 | 
             
            		return this.each(function(){
         | 
| 15631 15622 | 
             
            			if (!this.grid ) {return;}
         | 
| 15632 15623 | 
             
            			var $t = this, cw,
         | 
| 15633 | 
            -
            			initwidth = 0, brd=$.jgrid.cell_width ? 0: $t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0,
         | 
| 15634 | 
            -
            			cl = 0,cr;
         | 
| 15624 | 
            +
            			initwidth = 0, brd=$.jgrid.cell_width ? 0: $t.p.cellLayout, lvc, vc=0, hs=false, scw=$t.p.scrollOffset, aw, gw=0, cr;
         | 
| 15635 15625 | 
             
            			if(typeof shrink !== 'boolean') {
         | 
| 15636 15626 | 
             
            				shrink=$t.p.shrinkToFit;
         | 
| 15637 15627 | 
             
            			}
         | 
| @@ -15660,7 +15650,6 @@ $.jgrid.extend({ | |
| 15660 15650 | 
             
            						} else {
         | 
| 15661 15651 | 
             
            							vc++;
         | 
| 15662 15652 | 
             
            						}
         | 
| 15663 | 
            -
            						cl++;
         | 
| 15664 15653 | 
             
            					}
         | 
| 15665 15654 | 
             
            				});
         | 
| 15666 15655 | 
             
            				if(vc  === 0) { return; }
         | 
| @@ -16372,7 +16361,7 @@ $.jgrid.extend({ | |
| 16372 16361 | 
             
            				var fs =  $('.ui-jqgrid-view').css('font-size') || '11px';
         | 
| 16373 16362 | 
             
            				var str = '<ul id="sopt_menu" class="ui-search-menu" role="menu" tabindex="0" style="font-size:'+fs+';left:'+left+'px;top:'+top+'px;">',
         | 
| 16374 16363 | 
             
            				selected = $(elem).attr("soper"), selclass,
         | 
| 16375 | 
            -
            				aoprs = [],  | 
| 16364 | 
            +
            				aoprs = [], ina;
         | 
| 16376 16365 | 
             
            				var i=0, nm =$(elem).attr("colname"),len = $t.p.colModel.length;
         | 
| 16377 16366 | 
             
            				while(i<len) {
         | 
| 16378 16367 | 
             
            					if($t.p.colModel[i].name === nm) {
         | 
| @@ -16417,7 +16406,7 @@ $.jgrid.extend({ | |
| 16417 16406 | 
             
            			var tr = $("<tr class='ui-search-toolbar' role='rowheader'></tr>");
         | 
| 16418 16407 | 
             
            			var timeoutHnd;
         | 
| 16419 16408 | 
             
            			$.each($t.p.colModel,function(){
         | 
| 16420 | 
            -
            				var cm=this, soptions, surl, self, select = "", sot="=", so,
         | 
| 16409 | 
            +
            				var cm=this, soptions, surl, self, select = "", sot="=", so, i,
         | 
| 16421 16410 | 
             
            				th = $("<th role='columnheader' class='ui-state-default ui-th-column ui-th-"+$t.p.direction+"'></th>"),
         | 
| 16422 16411 | 
             
            				thd = $("<div style='position:relative;height:100%;padding-right:0.3em;padding-left:0.3em;'></div>"),
         | 
| 16423 16412 | 
             
            				stbl = $("<table class='ui-search-table' cellspacing='0'><tr><td class='ui-search-oper'></td><td class='ui-search-input'></td></tr></table>");
         | 
| @@ -16428,7 +16417,7 @@ $.jgrid.extend({ | |
| 16428 16417 | 
             
            				if(this.search){
         | 
| 16429 16418 | 
             
            					if(p.searchOperators) {
         | 
| 16430 16419 | 
             
            						so  = (soptions.sopt) ? soptions.sopt[0] : cm.stype==='select' ?  'eq' : p.defaultSearch;
         | 
| 16431 | 
            -
            						for( | 
| 16420 | 
            +
            						for(i = 0;i<p.odata.length;i++) {
         | 
| 16432 16421 | 
             
            							if(p.odata[i].oper === so) {
         | 
| 16433 16422 | 
             
            								sot = p.operands[so] || "";
         | 
| 16434 16423 | 
             
            								break;
         | 
| @@ -16490,7 +16479,7 @@ $.jgrid.extend({ | |
| 16490 16479 | 
             
            								var elem = document.createElement("select");
         | 
| 16491 16480 | 
             
            								elem.style.width = "100%";
         | 
| 16492 16481 | 
             
            								$(elem).attr({name:cm.index || cm.name, id: "gs_"+cm.name});
         | 
| 16493 | 
            -
            								var  | 
| 16482 | 
            +
            								var sv, ov, key, k;
         | 
| 16494 16483 | 
             
            								if(typeof oSv === "string") {
         | 
| 16495 16484 | 
             
            									so = oSv.split(delim);
         | 
| 16496 16485 | 
             
            									for(k=0; k<so.length;k++){
         | 
| @@ -17970,7 +17959,7 @@ $.extend($.jgrid,{ | |
| 17970 17959 | 
             
            		p = $.extend(true, {}, $.jgrid.jqModal || {}, p);
         | 
| 17971 17960 | 
             
            		var mw  = document.createElement('div'), rtlsup, self = this;
         | 
| 17972 17961 | 
             
            		css = $.extend({}, css || {});
         | 
| 17973 | 
            -
            		rtlsup = $(p.gbox).attr("dir")  | 
| 17962 | 
            +
            		rtlsup = $(p.gbox).attr("dir") === "rtl" ? true : false;
         | 
| 17974 17963 | 
             
            		mw.className= "ui-widget ui-widget-content ui-corner-all ui-jqdialog";
         | 
| 17975 17964 | 
             
            		mw.id = aIDs.themodal;
         | 
| 17976 17965 | 
             
            		var mh = document.createElement('div');
         | 
| @@ -18140,7 +18129,7 @@ $.extend($.jgrid,{ | |
| 18140 18129 | 
             
            		cnt += "</div>";
         | 
| 18141 18130 |  | 
| 18142 18131 | 
             
            		try {
         | 
| 18143 | 
            -
            			if($("#info_dialog").attr("aria-hidden")  | 
| 18132 | 
            +
            			if($("#info_dialog").attr("aria-hidden") === "false") {
         | 
| 18144 18133 | 
             
            				$.jgrid.hideModal("#info_dialog",{jqm:jm});
         | 
| 18145 18134 | 
             
            			}
         | 
| 18146 18135 | 
             
            			$("#info_dialog").remove();
         | 
| @@ -18224,7 +18213,7 @@ $.extend($.jgrid,{ | |
| 18224 18213 | 
             
            					if(!options.cols) { $(elem).css({width:"98%"});}
         | 
| 18225 18214 | 
             
            				} else if (!options.cols) { options.cols = 20; }
         | 
| 18226 18215 | 
             
            				if(!options.rows) { options.rows = 2; }
         | 
| 18227 | 
            -
            				if(vl | 
| 18216 | 
            +
            				if(vl===' ' || vl===' ' || (vl.length===1 && vl.charCodeAt(0)===160)) {vl="";}
         | 
| 18228 18217 | 
             
            				elem.value = vl;
         | 
| 18229 18218 | 
             
            				setAttributes(elem, options);
         | 
| 18230 18219 | 
             
            				$(elem).attr({"role":"textbox","multiline":"true"});
         | 
| @@ -18335,7 +18324,7 @@ $.extend($.jgrid,{ | |
| 18335 18324 | 
             
            							ov.setAttribute("role","option");
         | 
| 18336 18325 | 
             
            							ov.value = sv[0]; ov.innerHTML = sv[1];
         | 
| 18337 18326 | 
             
            							elem.appendChild(ov);
         | 
| 18338 | 
            -
            							if (!msl &&  ($.trim(sv[0])  | 
| 18327 | 
            +
            							if (!msl &&  ($.trim(sv[0]) === $.trim(vl) || $.trim(sv[1]) === $.trim(vl))) { ov.selected ="selected"; }
         | 
| 18339 18328 | 
             
            							if (msl && ($.inArray($.trim(sv[1]), ovm)>-1 || $.inArray($.trim(sv[0]), ovm)>-1)) {ov.selected ="selected";}
         | 
| 18340 18329 | 
             
            						}
         | 
| 18341 18330 | 
             
            					} else if (typeof options.value === 'object') {
         | 
| @@ -18346,7 +18335,7 @@ $.extend($.jgrid,{ | |
| 18346 18335 | 
             
            								ov.setAttribute("role","option");
         | 
| 18347 18336 | 
             
            								ov.value = key; ov.innerHTML = oSv[key];
         | 
| 18348 18337 | 
             
            								elem.appendChild(ov);
         | 
| 18349 | 
            -
            								if (!msl &&  ( $.trim(key)  | 
| 18338 | 
            +
            								if (!msl &&  ( $.trim(key) === $.trim(vl) || $.trim(oSv[key]) === $.trim(vl)) ) { ov.selected ="selected"; }
         | 
| 18350 18339 | 
             
            								if (msl && ($.inArray($.trim(oSv[key]),ovm)>-1 || $.inArray($.trim(key),ovm)>-1)) { ov.selected ="selected"; }
         | 
| 18351 18340 | 
             
            							}
         | 
| 18352 18341 | 
             
            						}
         | 
| @@ -18358,13 +18347,13 @@ $.extend($.jgrid,{ | |
| 18358 18347 | 
             
            			case "password" :
         | 
| 18359 18348 | 
             
            			case "button" :
         | 
| 18360 18349 | 
             
            				var role;
         | 
| 18361 | 
            -
            				if(eltype | 
| 18350 | 
            +
            				if(eltype==="button") { role = "button"; }
         | 
| 18362 18351 | 
             
            				else { role = "textbox"; }
         | 
| 18363 18352 | 
             
            				elem = document.createElement("input");
         | 
| 18364 18353 | 
             
            				elem.type = eltype;
         | 
| 18365 18354 | 
             
            				elem.value = vl;
         | 
| 18366 18355 | 
             
            				setAttributes(elem, options);
         | 
| 18367 | 
            -
            				if(eltype  | 
| 18356 | 
            +
            				if(eltype !== "button"){
         | 
| 18368 18357 | 
             
            					if(autowidth) {
         | 
| 18369 18358 | 
             
            						if(!options.size) { $(elem).css({width:"98%"}); }
         | 
| 18370 18359 | 
             
            					} else if (!options.size) { options.size = 20; }
         | 
| @@ -18392,8 +18381,8 @@ $.extend($.jgrid,{ | |
| 18392 18381 | 
             
            						throw "e1";
         | 
| 18393 18382 | 
             
            					}
         | 
| 18394 18383 | 
             
            				} catch (e) {
         | 
| 18395 | 
            -
            					if (e | 
| 18396 | 
            -
            					if (e | 
| 18384 | 
            +
            					if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.nodefined, $.jgrid.edit.bClose);}
         | 
| 18385 | 
            +
            					if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_element' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose);}
         | 
| 18397 18386 | 
             
            					else { $.jgrid.info_dialog($.jgrid.errors.errcap,typeof e==="string"?e:e.message,$.jgrid.edit.bClose); }
         | 
| 18398 18387 | 
             
            				}
         | 
| 18399 18388 | 
             
            			break;
         | 
| @@ -18459,7 +18448,7 @@ $.extend($.jgrid,{ | |
| 18459 18448 | 
             
            			return false;
         | 
| 18460 18449 | 
             
            		}
         | 
| 18461 18450 | 
             
            			strDate = tsp[format[dln]].toString();
         | 
| 18462 | 
            -
            			if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]] | 
| 18451 | 
            +
            			if (strDate.length<1 || tsp[format[dln]]<1 || tsp[format[dln]]>31 || (tsp[format[mln]]===2 && tsp[format[dln]]>daysInFebruary(tsp[format[j]])) || tsp[format[dln]] > daysInMonth[tsp[format[mln]]]){
         | 
| 18463 18452 | 
             
            				return false;
         | 
| 18464 18453 | 
             
            			}
         | 
| 18465 18454 | 
             
            		return true;
         | 
| @@ -18540,7 +18529,7 @@ $.extend($.jgrid,{ | |
| 18540 18529 | 
             
            			if(edtrul.integer === true) {
         | 
| 18541 18530 | 
             
            				if( !(rqfield === false && $.jgrid.isEmpty(val)) ) {
         | 
| 18542 18531 | 
             
            					if(isNaN(val)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""]; }
         | 
| 18543 | 
            -
            					if ((val % 1 !== 0) || (val.indexOf('.')  | 
| 18532 | 
            +
            					if ((val % 1 !== 0) || (val.indexOf('.') !== -1)) { return [false,nm+": "+$.jgrid.edit.msg.integer,""];}
         | 
| 18544 18533 | 
             
            				}
         | 
| 18545 18534 | 
             
            			}
         | 
| 18546 18535 | 
             
            			if(edtrul.date === true) {
         | 
| @@ -19658,7 +19647,7 @@ $.jgrid.extend({ | |
| 19658 19647 | 
             
            			onBeforeInit = $.isFunction(rp_ge[$t.p.id].beforeInitData) ? rp_ge[$t.p.id].beforeInitData : false,
         | 
| 19659 19648 | 
             
            			onInitializeForm = $.isFunction(rp_ge[$t.p.id].onInitializeForm) ? rp_ge[$t.p.id].onInitializeForm : false,
         | 
| 19660 19649 | 
             
            			showFrm = true,
         | 
| 19661 | 
            -
            			maxCols = 1, maxRows=0,	postdata,  | 
| 19650 | 
            +
            			maxCols = 1, maxRows=0,	postdata, diff, frmoper;
         | 
| 19662 19651 | 
             
            			frmgr = $.jgrid.jqID(frmgr);
         | 
| 19663 19652 | 
             
            			if (rowid === "new") {
         | 
| 19664 19653 | 
             
            				rowid = "_empty";
         | 
| @@ -19735,7 +19724,7 @@ $.jgrid.extend({ | |
| 19735 19724 | 
             
            				for (i =1; i<=maxcols;i++) {
         | 
| 19736 19725 | 
             
            					tmpl += tdtmpl;
         | 
| 19737 19726 | 
             
            				}
         | 
| 19738 | 
            -
            				if(rowid  | 
| 19727 | 
            +
            				if(rowid !== '_empty') {
         | 
| 19739 19728 | 
             
            					ind = $(obj).jqGrid("getInd",rowid);
         | 
| 19740 19729 | 
             
            				}
         | 
| 19741 19730 | 
             
            				$(obj.p.colModel).each( function(i) {
         | 
| @@ -19751,22 +19740,22 @@ $.jgrid.extend({ | |
| 19751 19740 | 
             
            						if(ind === false) {
         | 
| 19752 19741 | 
             
            							tmp = "";
         | 
| 19753 19742 | 
             
            						} else {
         | 
| 19754 | 
            -
            							if(nm  | 
| 19743 | 
            +
            							if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 19755 19744 | 
             
            								tmp = $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).text();
         | 
| 19756 19745 | 
             
            							} else {
         | 
| 19757 19746 | 
             
            								try {
         | 
| 19758 19747 | 
             
            									tmp =  $.unformat.call(obj, $("td[role='gridcell']:eq("+i+")",obj.rows[ind]),{rowId:rowid, colModel:this},i);
         | 
| 19759 19748 | 
             
            								} catch (_) {
         | 
| 19760 | 
            -
            									tmp =  (this.edittype && this.edittype  | 
| 19749 | 
            +
            									tmp =  (this.edittype && this.edittype === "textarea") ? $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).text() : $("td[role='gridcell']:eq("+i+")",obj.rows[ind]).html();
         | 
| 19761 19750 | 
             
            								}
         | 
| 19762 | 
            -
            								if(!tmp || tmp  | 
| 19751 | 
            +
            								if(!tmp || tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';}
         | 
| 19763 19752 | 
             
            							}
         | 
| 19764 19753 | 
             
            						}
         | 
| 19765 19754 | 
             
            						var opt = $.extend({}, this.editoptions || {} ,{id:nm,name:nm}),
         | 
| 19766 19755 | 
             
            						frmopt = $.extend({}, {elmprefix:'',elmsuffix:'',rowabove:false,rowcontent:''}, this.formoptions || {}),
         | 
| 19767 19756 | 
             
            						rp = parseInt(frmopt.rowpos,10) || cnt+1,
         | 
| 19768 19757 | 
             
            						cp = parseInt((parseInt(frmopt.colpos,10) || 1)*2,10);
         | 
| 19769 | 
            -
            						if(rowid  | 
| 19758 | 
            +
            						if(rowid === "_empty" && opt.defaultValue ) {
         | 
| 19770 19759 | 
             
            							tmp = $.isFunction(opt.defaultValue) ? opt.defaultValue.call($t) : opt.defaultValue;
         | 
| 19771 19760 | 
             
            						}
         | 
| 19772 19761 | 
             
            						if(!this.edittype) {this.edittype = "text";}
         | 
| @@ -19813,7 +19802,7 @@ $.jgrid.extend({ | |
| 19813 19802 | 
             
            				var nm,cnt=0,tmp, fld,opt,vl,vlc;
         | 
| 19814 19803 | 
             
            				if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) {rp_ge[$t.p.id]._savedData = {};rp_ge[$t.p.id]._savedData[obj.p.id+"_id"]=rowid;}
         | 
| 19815 19804 | 
             
            				var cm = obj.p.colModel;
         | 
| 19816 | 
            -
            				if(rowid  | 
| 19805 | 
            +
            				if(rowid === '_empty') {
         | 
| 19817 19806 | 
             
            					$(cm).each(function(){
         | 
| 19818 19807 | 
             
            						nm = this.name;
         | 
| 19819 19808 | 
             
            						opt = $.extend({}, this.editoptions || {} );
         | 
| @@ -19822,7 +19811,7 @@ $.jgrid.extend({ | |
| 19822 19811 | 
             
            							vl = "";
         | 
| 19823 19812 | 
             
            							if(opt.defaultValue ) {
         | 
| 19824 19813 | 
             
            								vl = $.isFunction(opt.defaultValue) ? opt.defaultValue.call($t) : opt.defaultValue;
         | 
| 19825 | 
            -
            								if(fld[0].type | 
| 19814 | 
            +
            								if(fld[0].type==='checkbox') {
         | 
| 19826 19815 | 
             
            									vlc = vl.toLowerCase();
         | 
| 19827 19816 | 
             
            									if(vlc.search(/(false|f|0|no|n|off|undefined)/i)<0 && vlc!=="") {
         | 
| 19828 19817 | 
             
            										fld[0].checked = true;
         | 
| @@ -19834,11 +19823,11 @@ $.jgrid.extend({ | |
| 19834 19823 | 
             
            									}
         | 
| 19835 19824 | 
             
            								} else {fld.val(vl);}
         | 
| 19836 19825 | 
             
            							} else {
         | 
| 19837 | 
            -
            								if( fld[0].type | 
| 19826 | 
            +
            								if( fld[0].type==='checkbox' ) {
         | 
| 19838 19827 | 
             
            									fld[0].checked = false;
         | 
| 19839 19828 | 
             
            									fld[0].defaultChecked = false;
         | 
| 19840 19829 | 
             
            									vl = $(fld).attr("offval");
         | 
| 19841 | 
            -
            								} else if (fld[0].type && fld[0].type.substr(0,6) | 
| 19830 | 
            +
            								} else if (fld[0].type && fld[0].type.substr(0,6)==='select') {
         | 
| 19842 19831 | 
             
            									fld[0].selectedIndex = 0;
         | 
| 19843 19832 | 
             
            								} else {
         | 
| 19844 19833 | 
             
            									fld.val(vl);
         | 
| @@ -19856,13 +19845,13 @@ $.jgrid.extend({ | |
| 19856 19845 | 
             
            					nm = cm[i].name;
         | 
| 19857 19846 | 
             
            					// hidden fields are included in the form
         | 
| 19858 19847 | 
             
            					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn' && cm[i].editable===true) {
         | 
| 19859 | 
            -
            						if(nm  | 
| 19848 | 
            +
            						if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 19860 19849 | 
             
            							tmp = $(this).text();
         | 
| 19861 19850 | 
             
            						} else {
         | 
| 19862 19851 | 
             
            							try {
         | 
| 19863 19852 | 
             
            								tmp =  $.unformat.call(obj, $(this),{rowId:rowid, colModel:cm[i]},i);
         | 
| 19864 19853 | 
             
            							} catch (_) {
         | 
| 19865 | 
            -
            								tmp = cm[i].edittype | 
| 19854 | 
            +
            								tmp = cm[i].edittype==="textarea" ? $(this).text() : $(this).html();
         | 
| 19866 19855 | 
             
            							}
         | 
| 19867 19856 | 
             
            						}
         | 
| 19868 19857 | 
             
            						if($t.p.autoencode) {tmp = $.jgrid.htmlDecode(tmp);}
         | 
| @@ -19874,14 +19863,14 @@ $.jgrid.extend({ | |
| 19874 19863 | 
             
            							case "button" :
         | 
| 19875 19864 | 
             
            							case "image":
         | 
| 19876 19865 | 
             
            							case "textarea":
         | 
| 19877 | 
            -
            								if(tmp  | 
| 19866 | 
            +
            								if(tmp === " " || tmp === " " || (tmp.length===1 && tmp.charCodeAt(0)===160) ) {tmp='';}
         | 
| 19878 19867 | 
             
            								$("#"+nm,"#"+fmid).val(tmp);
         | 
| 19879 19868 | 
             
            								break;
         | 
| 19880 19869 | 
             
            							case "select":
         | 
| 19881 19870 | 
             
            								var opv = tmp.split(",");
         | 
| 19882 19871 | 
             
            								opv = $.map(opv,function(n){return $.trim(n);});
         | 
| 19883 19872 | 
             
            								$("#"+nm+" option","#"+fmid).each(function(){
         | 
| 19884 | 
            -
            									if (!cm[i].editoptions.multiple && ($.trim(tmp)  | 
| 19873 | 
            +
            									if (!cm[i].editoptions.multiple && ($.trim(tmp) === $.trim($(this).text()) || opv[0] === $.trim($(this).text()) || opv[0] === $.trim($(this).val())) ){
         | 
| 19885 19874 | 
             
            										this.selected= true;
         | 
| 19886 19875 | 
             
            									} else if (cm[i].editoptions.multiple){
         | 
| 19887 19876 | 
             
            										if(  $.inArray($.trim($(this).text()), opv ) > -1 || $.inArray($.trim($(this).val()), opv ) > -1  ){
         | 
| @@ -19898,7 +19887,7 @@ $.jgrid.extend({ | |
| 19898 19887 | 
             
            								tmp = String(tmp);
         | 
| 19899 19888 | 
             
            								if(cm[i].editoptions && cm[i].editoptions.value) {
         | 
| 19900 19889 | 
             
            									var cb = cm[i].editoptions.value.split(":");
         | 
| 19901 | 
            -
            									if(cb[0]  | 
| 19890 | 
            +
            									if(cb[0] === tmp) {
         | 
| 19902 19891 | 
             
            										$("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']({"checked":true, "defaultChecked" : true});
         | 
| 19903 19892 | 
             
            									} else {
         | 
| 19904 19893 | 
             
            										$("#"+nm,"#"+fmid)[$t.p.useProp ? 'prop': 'attr']({"checked":false, "defaultChecked" : false});
         | 
| @@ -19920,7 +19909,7 @@ $.jgrid.extend({ | |
| 19920 19909 | 
             
            										cm[i].editoptions.custom_value.call($t, $("#"+nm,"#"+fmid),'set',tmp);
         | 
| 19921 19910 | 
             
            									} else {throw "e1";}
         | 
| 19922 19911 | 
             
            								} catch (e) {
         | 
| 19923 | 
            -
            									if (e | 
| 19912 | 
            +
            									if (e==="e1") {$.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose);}
         | 
| 19924 19913 | 
             
            									else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose);}
         | 
| 19925 19914 | 
             
            								}
         | 
| 19926 19915 | 
             
            								break;
         | 
| @@ -19976,8 +19965,8 @@ $.jgrid.extend({ | |
| 19976 19965 | 
             
            					oper = opers.oper;
         | 
| 19977 19966 | 
             
            					idname = opers.id;
         | 
| 19978 19967 | 
             
            					// we add to pos data array the action - the name is oper
         | 
| 19979 | 
            -
            					postdata[oper] = ($.trim(postdata[$t.p.id+"_id"])  | 
| 19980 | 
            -
            					if(postdata[oper]  | 
| 19968 | 
            +
            					postdata[oper] = ($.trim(postdata[$t.p.id+"_id"]) === "_empty") ? opers.addoper : opers.editoper;
         | 
| 19969 | 
            +
            					if(postdata[oper] !== opers.addoper) {
         | 
| 19981 19970 | 
             
            						postdata[idname] = postdata[$t.p.id+"_id"];
         | 
| 19982 19971 | 
             
            					} else {
         | 
| 19983 19972 | 
             
            						// check to see if we have allredy this field in the form and if yes lieve it
         | 
| @@ -19986,16 +19975,16 @@ $.jgrid.extend({ | |
| 19986 19975 | 
             
            					delete postdata[$t.p.id+"_id"];
         | 
| 19987 19976 | 
             
            					postdata = $.extend(postdata,rp_ge[$t.p.id].editData,onCS);
         | 
| 19988 19977 | 
             
            					if($t.p.treeGrid === true)  {
         | 
| 19989 | 
            -
            						if(postdata[oper]  | 
| 19978 | 
            +
            						if(postdata[oper] === opers.addoper) {
         | 
| 19990 19979 | 
             
            						selr = $($t).jqGrid("getGridParam", 'selrow');
         | 
| 19991 | 
            -
            							var tr_par_id = $t.p.treeGridModel  | 
| 19980 | 
            +
            							var tr_par_id = $t.p.treeGridModel === 'adjacency' ? $t.p.treeReader.parent_id_field : 'parent_id';
         | 
| 19992 19981 | 
             
            							postdata[tr_par_id] = selr;
         | 
| 19993 19982 | 
             
            						}
         | 
| 19994 19983 | 
             
            						for(i in $t.p.treeReader){
         | 
| 19995 19984 | 
             
            							if($t.p.treeReader.hasOwnProperty(i)) {
         | 
| 19996 19985 | 
             
            								var itm = $t.p.treeReader[i];
         | 
| 19997 19986 | 
             
            								if(postdata.hasOwnProperty(itm)) {
         | 
| 19998 | 
            -
            									if(postdata[oper]  | 
| 19987 | 
            +
            									if(postdata[oper] === opers.addoper && i === 'parent_id_field') {continue;}
         | 
| 19999 19988 | 
             
            									delete postdata[itm];
         | 
| 20000 19989 | 
             
            								}
         | 
| 20001 19990 | 
             
            							}
         | 
| @@ -20183,7 +20172,7 @@ $.jgrid.extend({ | |
| 20183 20172 | 
             
            					$("#pData",frmtb+"_2").removeClass('ui-state-disabled');
         | 
| 20184 20173 | 
             
            				}
         | 
| 20185 20174 |  | 
| 20186 | 
            -
            				if (cr | 
| 20175 | 
            +
            				if (cr===totr) {
         | 
| 20187 20176 | 
             
            					$("#nData",frmtb+"_2").addClass('ui-state-disabled');
         | 
| 20188 20177 | 
             
            				} else if( posarr[1][cr+1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr+1])).hasClass('ui-state-disabled')) {
         | 
| 20189 20178 | 
             
            					$("#nData",frmtb+"_2").addClass('ui-state-disabled');
         | 
| @@ -20225,7 +20214,7 @@ $.jgrid.extend({ | |
| 20225 20214 | 
             
            				// filldata
         | 
| 20226 20215 | 
             
            				fillData(rowid,$t,frmgr);
         | 
| 20227 20216 | 
             
            				///
         | 
| 20228 | 
            -
            				if(rowid | 
| 20217 | 
            +
            				if(rowid==="_empty" || !rp_ge[$t.p.id].viewPagerButtons) {
         | 
| 20229 20218 | 
             
            					$("#pData, #nData",frmtb+"_2").hide();
         | 
| 20230 20219 | 
             
            				} else {
         | 
| 20231 20220 | 
             
            					$("#pData, #nData",frmtb+"_2").show();
         | 
| @@ -20281,7 +20270,7 @@ $.jgrid.extend({ | |
| 20281 20270 | 
             
            				// set the id.
         | 
| 20282 20271 | 
             
            				// use carefull only to change here colproperties.
         | 
| 20283 20272 | 
             
            				// create data
         | 
| 20284 | 
            -
            				var rtlb = $t.p.direction  | 
| 20273 | 
            +
            				var rtlb = $t.p.direction === "rtl" ? true :false,
         | 
| 20285 20274 | 
             
            				bp = rtlb ? "nData" : "pData",
         | 
| 20286 20275 | 
             
            				bn = rtlb ? "pData" : "nData";
         | 
| 20287 20276 | 
             
            				createData(rowid,$t,tbl,maxCols);
         | 
| @@ -20325,8 +20314,8 @@ $.jgrid.extend({ | |
| 20325 20314 | 
             
            				$("#"+$.jgrid.jqID(IDs.themodal)).keydown( function( e ) {
         | 
| 20326 20315 | 
             
            					var wkey = e.target;
         | 
| 20327 20316 | 
             
            					if ($("#"+frmgr).data("disabled")===true ) {return false;}//??
         | 
| 20328 | 
            -
            					if(rp_ge[$t.p.id].savekey[0] === true && e.which  | 
| 20329 | 
            -
            						if(wkey.tagName  | 
| 20317 | 
            +
            					if(rp_ge[$t.p.id].savekey[0] === true && e.which === rp_ge[$t.p.id].savekey[1]) { // save
         | 
| 20318 | 
            +
            						if(wkey.tagName !== "TEXTAREA") {
         | 
| 20330 20319 | 
             
            							$("#sData", frmtb+"_2").trigger("click");
         | 
| 20331 20320 | 
             
            							return false;
         | 
| 20332 20321 | 
             
            						}
         | 
| @@ -20337,12 +20326,12 @@ $.jgrid.extend({ | |
| 20337 20326 | 
             
            						return false;
         | 
| 20338 20327 | 
             
            					}
         | 
| 20339 20328 | 
             
            					if(rp_ge[$t.p.id].navkeys[0]===true) {
         | 
| 20340 | 
            -
            						if($("#id_g",frmtb).val()  | 
| 20341 | 
            -
            						if(e.which  | 
| 20329 | 
            +
            						if($("#id_g",frmtb).val() === "_empty") {return true;}
         | 
| 20330 | 
            +
            						if(e.which === rp_ge[$t.p.id].navkeys[1]){ //up
         | 
| 20342 20331 | 
             
            							$("#pData", frmtb+"_2").trigger("click");
         | 
| 20343 20332 | 
             
            							return false;
         | 
| 20344 20333 | 
             
            						}
         | 
| 20345 | 
            -
            						if(e.which  | 
| 20334 | 
            +
            						if(e.which === rp_ge[$t.p.id].navkeys[2]){ //down
         | 
| 20346 20335 | 
             
            							$("#nData", frmtb+"_2").trigger("click");
         | 
| 20347 20336 | 
             
            							return false;
         | 
| 20348 20337 | 
             
            						}
         | 
| @@ -20361,11 +20350,11 @@ $.jgrid.extend({ | |
| 20361 20350 | 
             
            				p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon);
         | 
| 20362 20351 | 
             
            				// beforeinitdata after creation of the form
         | 
| 20363 20352 | 
             
            				if(p.saveicon[0]===true) {
         | 
| 20364 | 
            -
            					$("#sData",frmtb+"_2").addClass(p.saveicon[1]  | 
| 20353 | 
            +
            					$("#sData",frmtb+"_2").addClass(p.saveicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 20365 20354 | 
             
            					.append("<span class='ui-icon "+p.saveicon[2]+"'></span>");
         | 
| 20366 20355 | 
             
            				}
         | 
| 20367 20356 | 
             
            				if(p.closeicon[0]===true) {
         | 
| 20368 | 
            -
            					$("#cData",frmtb+"_2").addClass(p.closeicon[1]  | 
| 20357 | 
            +
            					$("#cData",frmtb+"_2").addClass(p.closeicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 20369 20358 | 
             
            					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
         | 
| 20370 20359 | 
             
            				}
         | 
| 20371 20360 | 
             
            				if(rp_ge[$t.p.id].checkOnSubmit || rp_ge[$t.p.id].checkOnUpdate) {
         | 
| @@ -20396,7 +20385,7 @@ $.jgrid.extend({ | |
| 20396 20385 | 
             
            				// here initform - only once
         | 
| 20397 20386 | 
             
            				$($t).triggerHandler("jqGridAddEditInitializeForm", [$("#"+frmgr), frmoper]);
         | 
| 20398 20387 | 
             
            				if(onInitializeForm) {onInitializeForm.call($t,$("#"+frmgr), frmoper);}
         | 
| 20399 | 
            -
            				if(rowid | 
| 20388 | 
            +
            				if(rowid==="_empty" || !rp_ge[$t.p.id].viewPagerButtons) {$("#pData,#nData",frmtb+"_2").hide();} else {$("#pData,#nData",frmtb+"_2").show();}
         | 
| 20400 20389 | 
             
            				$($t).triggerHandler("jqGridAddEditBeforeShowForm", [$("#"+frmgr), frmoper]);
         | 
| 20401 20390 | 
             
            				if(onBeforeShow) { onBeforeShow.call($t, $("#"+frmgr), frmoper);}
         | 
| 20402 20391 | 
             
            				$("#"+$.jgrid.jqID(IDs.themodal)).data("onClose",rp_ge[$t.p.id].onClose);
         | 
| @@ -20422,7 +20411,7 @@ $.jgrid.extend({ | |
| 20422 20411 | 
             
            					//ret[1] - msg if not succes
         | 
| 20423 20412 | 
             
            					//ret[2] - the id  that will be set if reload after submit false
         | 
| 20424 20413 | 
             
            					getFormData();
         | 
| 20425 | 
            -
            					if(postdata[$t.p.id+"_id"]  | 
| 20414 | 
            +
            					if(postdata[$t.p.id+"_id"] === "_empty")	{postIt();}
         | 
| 20426 20415 | 
             
            					else if(p.checkOnSubmit===true ) {
         | 
| 20427 20416 | 
             
            						diff = compareData(postdata,rp_ge[$t.p.id]._savedData);
         | 
| 20428 20417 | 
             
            						if(diff) {
         | 
| @@ -20540,7 +20529,7 @@ $.jgrid.extend({ | |
| 20540 20529 | 
             
            				tdtmpl2 = "<td class='CaptionTD form-view-label ui-widget-content'> </td><td class='DataTD form-view-data ui-widget-content'> </td>",
         | 
| 20541 20530 | 
             
            				fmtnum = ['integer','number','currency'],max1 =0, max2=0 ,maxw,setme, viewfld;
         | 
| 20542 20531 | 
             
            				for (i=1;i<=maxcols;i++) {
         | 
| 20543 | 
            -
            					tmpl += i  | 
| 20532 | 
            +
            					tmpl += i === 1 ? tdtmpl : tdtmpl2;
         | 
| 20544 20533 | 
             
            				}
         | 
| 20545 20534 | 
             
            				// find max number align rigth with property formatter
         | 
| 20546 20535 | 
             
            				$(obj.p.colModel).each( function() {
         | 
| @@ -20574,7 +20563,7 @@ $.jgrid.extend({ | |
| 20574 20563 | 
             
            						if(ind === false) {
         | 
| 20575 20564 | 
             
            							tmp = "";
         | 
| 20576 20565 | 
             
            						} else {
         | 
| 20577 | 
            -
            							if(nm  | 
| 20566 | 
            +
            							if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 20578 20567 | 
             
            								tmp = $("td:eq("+i+")",obj.rows[ind]).text();
         | 
| 20579 20568 | 
             
            							} else {
         | 
| 20580 20569 | 
             
            								tmp = $("td:eq("+i+")",obj.rows[ind]).html();
         | 
| @@ -20613,7 +20602,7 @@ $.jgrid.extend({ | |
| 20613 20602 | 
             
            				return retpos;
         | 
| 20614 20603 | 
             
            			}
         | 
| 20615 20604 | 
             
            			function fillData(rowid,obj){
         | 
| 20616 | 
            -
            				var nm, hc,cnt=0,tmp, | 
| 20605 | 
            +
            				var nm, hc,cnt=0,tmp,trv;
         | 
| 20617 20606 | 
             
            				trv = $(obj).jqGrid("getInd",rowid,true);
         | 
| 20618 20607 | 
             
            				if(!trv) {return;}
         | 
| 20619 20608 | 
             
            				$('td',trv).each( function(i) {
         | 
| @@ -20625,12 +20614,11 @@ $.jgrid.extend({ | |
| 20625 20614 | 
             
            						hc = obj.p.colModel[i].hidden === true ? true : false;
         | 
| 20626 20615 | 
             
            					}
         | 
| 20627 20616 | 
             
            					if ( nm !== 'cb' && nm !== 'subgrid' && nm !== 'rn') {
         | 
| 20628 | 
            -
            						if(nm  | 
| 20617 | 
            +
            						if(nm === obj.p.ExpandColumn && obj.p.treeGrid === true) {
         | 
| 20629 20618 | 
             
            							tmp = $(this).text();
         | 
| 20630 20619 | 
             
            						} else {
         | 
| 20631 20620 | 
             
            							tmp = $(this).html();
         | 
| 20632 20621 | 
             
            						}
         | 
| 20633 | 
            -
            						opt = $.extend({},obj.p.colModel[i].editoptions || {});
         | 
| 20634 20622 | 
             
            						nm = $.jgrid.jqID("v_"+nm);
         | 
| 20635 20623 | 
             
            						$("#"+nm+" span","#"+frmtb).html(tmp);
         | 
| 20636 20624 | 
             
            						if (hc) {$("#"+nm,"#"+frmtb).parents("tr:first").hide();}
         | 
| @@ -20648,7 +20636,7 @@ $.jgrid.extend({ | |
| 20648 20636 | 
             
            				} else {
         | 
| 20649 20637 | 
             
            					$("#pData","#"+frmtb+"_2").removeClass('ui-state-disabled');
         | 
| 20650 20638 | 
             
            				}
         | 
| 20651 | 
            -
            				if (cr | 
| 20639 | 
            +
            				if (cr===totr) {
         | 
| 20652 20640 | 
             
            					$("#nData","#"+frmtb+"_2").addClass('ui-state-disabled');
         | 
| 20653 20641 | 
             
            				} else if( posarr[1][cr+1] !== undefined && $("#"+$.jgrid.jqID(posarr[1][cr+1])).hasClass('ui-state-disabled')) {
         | 
| 20654 20642 | 
             
            					$("#nData",frmtb+"_2").addClass('ui-state-disabled');
         | 
| @@ -20697,7 +20685,7 @@ $.jgrid.extend({ | |
| 20697 20685 | 
             
            				// set the id.
         | 
| 20698 20686 | 
             
            				$(frm).append(tbl);
         | 
| 20699 20687 | 
             
            				createData(rowid, $t, tbl, maxCols);
         | 
| 20700 | 
            -
            				var rtlb = $t.p.direction  | 
| 20688 | 
            +
            				var rtlb = $t.p.direction === "rtl" ? true :false,
         | 
| 20701 20689 | 
             
            				bp = rtlb ? "nData" : "pData",
         | 
| 20702 20690 | 
             
            				bn = rtlb ? "pData" : "nData",
         | 
| 20703 20691 |  | 
| @@ -20746,7 +20734,7 @@ $.jgrid.extend({ | |
| 20746 20734 | 
             
            				});
         | 
| 20747 20735 | 
             
            				p.closeicon = $.extend([true,"left","ui-icon-close"],p.closeicon);
         | 
| 20748 20736 | 
             
            				if(p.closeicon[0]===true) {
         | 
| 20749 | 
            -
            					$("#cData","#"+frmtb+"_2").addClass(p.closeicon[1]  | 
| 20737 | 
            +
            					$("#cData","#"+frmtb+"_2").addClass(p.closeicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 20750 20738 | 
             
            					.append("<span class='ui-icon "+p.closeicon[2]+"'></span>");
         | 
| 20751 20739 | 
             
            				}
         | 
| 20752 20740 | 
             
            				if($.isFunction(p.beforeShowForm)) {p.beforeShowForm.call($t,$("#"+frmgr));}
         | 
| @@ -20764,7 +20752,7 @@ $.jgrid.extend({ | |
| 20764 20752 | 
             
            					$("#FormError","#"+frmtb).hide();
         | 
| 20765 20753 | 
             
            					var npos = getCurrPos();
         | 
| 20766 20754 | 
             
            					npos[0] = parseInt(npos[0],10);
         | 
| 20767 | 
            -
            					if(npos[0]  | 
| 20755 | 
            +
            					if(npos[0] !== -1 && npos[1][npos[0]+1]) {
         | 
| 20768 20756 | 
             
            						if($.isFunction(p.onclickPgButtons)) {
         | 
| 20769 20757 | 
             
            							p.onclickPgButtons.call($t,'next',$("#"+frmgr),npos[1][npos[0]]);
         | 
| 20770 20758 | 
             
            						}
         | 
| @@ -20781,7 +20769,7 @@ $.jgrid.extend({ | |
| 20781 20769 | 
             
            				$("#pData", "#"+frmtb+"_2").click(function(){
         | 
| 20782 20770 | 
             
            					$("#FormError","#"+frmtb).hide();
         | 
| 20783 20771 | 
             
            					var ppos = getCurrPos();
         | 
| 20784 | 
            -
            					if(ppos[0]  | 
| 20772 | 
            +
            					if(ppos[0] !== -1 && ppos[1][ppos[0]-1]) {
         | 
| 20785 20773 | 
             
            						if($.isFunction(p.onclickPgButtons)) {
         | 
| 20786 20774 | 
             
            							p.onclickPgButtons.call($t,'prev',$("#"+frmgr),ppos[1][ppos[0]]);
         | 
| 20787 20775 | 
             
            						}
         | 
| @@ -20894,11 +20882,11 @@ $.jgrid.extend({ | |
| 20894 20882 | 
             
            				p.delicon = $.extend([true,"left","ui-icon-scissors"],rp_ge[$t.p.id].delicon);
         | 
| 20895 20883 | 
             
            				p.cancelicon = $.extend([true,"left","ui-icon-cancel"],rp_ge[$t.p.id].cancelicon);
         | 
| 20896 20884 | 
             
            				if(p.delicon[0]===true) {
         | 
| 20897 | 
            -
            					$("#dData","#"+dtbl+"_2").addClass(p.delicon[1]  | 
| 20885 | 
            +
            					$("#dData","#"+dtbl+"_2").addClass(p.delicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 20898 20886 | 
             
            					.append("<span class='ui-icon "+p.delicon[2]+"'></span>");
         | 
| 20899 20887 | 
             
            				}
         | 
| 20900 20888 | 
             
            				if(p.cancelicon[0]===true) {
         | 
| 20901 | 
            -
            					$("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1]  | 
| 20889 | 
            +
            					$("#eData","#"+dtbl+"_2").addClass(p.cancelicon[1] === "right" ? 'fm-button-icon-right' : 'fm-button-icon-left')
         | 
| 20902 20890 | 
             
            					.append("<span class='ui-icon "+p.cancelicon[2]+"'></span>");
         | 
| 20903 20891 | 
             
            				}
         | 
| 20904 20892 | 
             
            				$("#dData","#"+dtbl+"_2").click(function(){
         | 
| @@ -20947,7 +20935,7 @@ $.jgrid.extend({ | |
| 20947 20935 | 
             
            									$("#DelError>td","#"+dtbl).html(ret[1]);
         | 
| 20948 20936 | 
             
            									$("#DelError","#"+dtbl).show();
         | 
| 20949 20937 | 
             
            								} else {
         | 
| 20950 | 
            -
            									if(rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype  | 
| 20938 | 
            +
            									if(rp_ge[$t.p.id].reloadAfterSubmit && $t.p.datatype !== "local") {
         | 
| 20951 20939 | 
             
            										$($t).trigger("reloadGrid");
         | 
| 20952 20940 | 
             
            									} else {
         | 
| 20953 20941 | 
             
            										if($t.p.treeGrid===true){
         | 
| @@ -21098,7 +21086,7 @@ $.jgrid.extend({ | |
| 21098 21086 | 
             
            				if(i===0) {
         | 
| 21099 21087 | 
             
            					pgid = elem;
         | 
| 21100 21088 | 
             
            					elemids = $t.p.id;
         | 
| 21101 | 
            -
            					if(pgid  | 
| 21089 | 
            +
            					if(pgid === $t.p.toppager) {
         | 
| 21102 21090 | 
             
            						elemids += "_top";
         | 
| 21103 21091 | 
             
            						clone = 1;
         | 
| 21104 21092 | 
             
            					}
         | 
| @@ -21106,7 +21094,7 @@ $.jgrid.extend({ | |
| 21106 21094 | 
             
            					pgid = $t.p.toppager;
         | 
| 21107 21095 | 
             
            					elemids = $t.p.id+"_top";
         | 
| 21108 21096 | 
             
            				}
         | 
| 21109 | 
            -
            				if($t.p.direction  | 
| 21097 | 
            +
            				if($t.p.direction === "rtl") {$(navtbl).attr("dir","rtl").css("float","right");}
         | 
| 21110 21098 | 
             
            				if (o.add) {
         | 
| 21111 21099 | 
             
            					pAdd = pAdd || {};
         | 
| 21112 21100 | 
             
            					tbd = $("<td class='ui-pg-button ui-corner-all'></td>");
         | 
| @@ -21294,13 +21282,13 @@ $.jgrid.extend({ | |
| 21294 21282 | 
             
            			if (findnav) {
         | 
| 21295 21283 | 
             
            				if( p.id && $("#"+$.jgrid.jqID(p.id), findnav)[0] !== undefined )  {return;}
         | 
| 21296 21284 | 
             
            				var tbd = $("<td></td>");
         | 
| 21297 | 
            -
            				if(p.buttonicon.toString().toUpperCase()  | 
| 21285 | 
            +
            				if(p.buttonicon.toString().toUpperCase() === "NONE") {
         | 
| 21298 21286 | 
             
                                $(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'>"+p.caption+"</div>");
         | 
| 21299 21287 | 
             
            				} else	{
         | 
| 21300 21288 | 
             
            					$(tbd).addClass('ui-pg-button ui-corner-all').append("<div class='ui-pg-div'><span class='ui-icon "+p.buttonicon+"'></span>"+p.caption+"</div>");
         | 
| 21301 21289 | 
             
            				}
         | 
| 21302 21290 | 
             
            				if(p.id) {$(tbd).attr("id",p.id);}
         | 
| 21303 | 
            -
            				if(p.position | 
| 21291 | 
            +
            				if(p.position==='first'){
         | 
| 21304 21292 | 
             
            					if(findnav.rows[0].cells.length ===0 ) {
         | 
| 21305 21293 | 
             
            						$("tr",findnav).append(tbd);
         | 
| 21306 21294 | 
             
            					} else {
         | 
| @@ -21388,8 +21376,8 @@ $.jgrid.extend({ | |
| 21388 21376 | 
             
            			$.each(fields, function(i, field){
         | 
| 21389 21377 | 
             
            				griddata[field.name] = field.value;
         | 
| 21390 21378 | 
             
            			});
         | 
| 21391 | 
            -
            			if(mode | 
| 21392 | 
            -
            			else if(mode | 
| 21379 | 
            +
            			if(mode==='add') {$($t).jqGrid("addRowData",rowid,griddata, position);}
         | 
| 21380 | 
            +
            			else if(mode==='set') {$($t).jqGrid("setRowData",rowid,griddata);}
         | 
| 21393 21381 | 
             
            		});
         | 
| 21394 21382 | 
             
            	}
         | 
| 21395 21383 | 
             
            });
         | 
| @@ -21448,7 +21436,7 @@ $.jgrid.extend({ | |
| 21448 21436 | 
             
            			ind = $($t).jqGrid("getInd",rowid,true);
         | 
| 21449 21437 | 
             
            			if( ind === false ) {return;}
         | 
| 21450 21438 | 
             
            			editable = $(ind).attr("editable") || "0";
         | 
| 21451 | 
            -
            			if (editable  | 
| 21439 | 
            +
            			if (editable === "0" && !$(ind).hasClass("not-editable-row")) {
         | 
| 21452 21440 | 
             
            				cm = $t.p.colModel;
         | 
| 21453 21441 | 
             
            				$('td[role="gridcell"]',ind).each( function(i) {
         | 
| 21454 21442 | 
             
            					nm = cm[i].name;
         | 
| @@ -22076,7 +22064,7 @@ $.jgrid.extend({ | |
| 22076 22064 | 
             
            			}
         | 
| 22077 22065 | 
             
            			cm = $t.p.colModel[iCol];
         | 
| 22078 22066 | 
             
            			nm = cm.name;
         | 
| 22079 | 
            -
            			if (nm | 
| 22067 | 
            +
            			if (nm==='subgrid' || nm==='cb' || nm==='rn') {return;}
         | 
| 22080 22068 | 
             
            			cc = $("td:eq("+iCol+")",$t.rows[iRow]);
         | 
| 22081 22069 | 
             
            			if (cm.editable===true && ed===true && !cc.hasClass("not-editable-cell")) {
         | 
| 22082 22070 | 
             
            				if(parseInt($t.p.iCol,10)>=0  && parseInt($t.p.iRow,10)>=0) {
         | 
| @@ -22088,7 +22076,7 @@ $.jgrid.extend({ | |
| 22088 22076 | 
             
            				try {
         | 
| 22089 22077 | 
             
            					tmp =  $.unformat.call($t,cc,{rowId: $t.rows[iRow].id, colModel:cm},iCol);
         | 
| 22090 22078 | 
             
            				} catch (_) {
         | 
| 22091 | 
            -
            					tmp = ( cm.edittype && cm.edittype  | 
| 22079 | 
            +
            					tmp = ( cm.edittype && cm.edittype === 'textarea' ) ? $(cc).text() : $(cc).html();
         | 
| 22092 22080 | 
             
            				}
         | 
| 22093 22081 | 
             
            				if($t.p.autoencode) { tmp = $.jgrid.htmlDecode(tmp); }
         | 
| 22094 22082 | 
             
            				if (!cm.edittype) {cm.edittype = "text";}
         | 
| @@ -22199,8 +22187,8 @@ $.jgrid.extend({ | |
| 22199 22187 | 
             
            								if (v===undefined) { throw "e2";} else { v2=v; }
         | 
| 22200 22188 | 
             
            							} else { throw "e1"; }
         | 
| 22201 22189 | 
             
            						} catch (e) {
         | 
| 22202 | 
            -
            							if (e | 
| 22203 | 
            -
            							if (e | 
| 22190 | 
            +
            							if (e==="e1") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.nodefined,$.jgrid.edit.bClose); }
         | 
| 22191 | 
            +
            							if (e==="e2") { $.jgrid.info_dialog($.jgrid.errors.errcap,"function 'custom_value' "+$.jgrid.edit.msg.novalue,$.jgrid.edit.bClose); }
         | 
| 22204 22192 | 
             
            							else {$.jgrid.info_dialog($.jgrid.errors.errcap,e.message,$.jgrid.edit.bClose); }
         | 
| 22205 22193 | 
             
            						}
         | 
| 22206 22194 | 
             
            						break;
         | 
| @@ -22221,7 +22209,7 @@ $.jgrid.extend({ | |
| 22221 22209 | 
             
            							if (!addpost) {addpost={};}
         | 
| 22222 22210 | 
             
            						}
         | 
| 22223 22211 | 
             
            						if( $("input.hasDatepicker",cc).length >0) { $("input.hasDatepicker",cc).datepicker('hide'); }
         | 
| 22224 | 
            -
            						if ($t.p.cellsubmit  | 
| 22212 | 
            +
            						if ($t.p.cellsubmit === 'remote') {
         | 
| 22225 22213 | 
             
            							if ($t.p.cellurl) {
         | 
| 22226 22214 | 
             
            								var postdata = {};
         | 
| 22227 22215 | 
             
            								if($t.p.autoencode) { v = $.jgrid.htmlEncode(v); }
         | 
| @@ -22242,7 +22230,7 @@ $.jgrid.extend({ | |
| 22242 22230 | 
             
            									complete: function (result, stat) {
         | 
| 22243 22231 | 
             
            										$("#lui_"+$t.p.id).hide();
         | 
| 22244 22232 | 
             
            										$t.grid.hDiv.loading = false;
         | 
| 22245 | 
            -
            										if (stat  | 
| 22233 | 
            +
            										if (stat === 'success') {
         | 
| 22246 22234 | 
             
            											var ret = $($t).triggerHandler("jqGridAfterSubmitCell", [$t, result, postdata.id, nm, v, iRow, iCol]) || [true, ''];
         | 
| 22247 22235 | 
             
            											if (ret[0] === true && $.isFunction($t.p.afterSubmitCell)) {
         | 
| 22248 22236 | 
             
            												ret = $t.p.afterSubmitCell.call($t, result,postdata.id,nm,v,iRow,iCol);
         | 
| @@ -22283,7 +22271,7 @@ $.jgrid.extend({ | |
| 22283 22271 | 
             
            								} catch (e) {}
         | 
| 22284 22272 | 
             
            							}
         | 
| 22285 22273 | 
             
            						}
         | 
| 22286 | 
            -
            						if ($t.p.cellsubmit  | 
| 22274 | 
            +
            						if ($t.p.cellsubmit === 'clientArray') {
         | 
| 22287 22275 | 
             
            							$(cc).empty();
         | 
| 22288 22276 | 
             
            							$($t).jqGrid("setCell",$t.rows[iRow].id,iCol, v2, false, false, true);
         | 
| 22289 22277 | 
             
            							$(cc).addClass("dirty-cell");
         | 
| @@ -22378,23 +22366,23 @@ $.jgrid.extend({ | |
| 22378 22366 | 
             
            			var selection = $("<div style='position:fixed;top:0px;width:1px;height:1px;' tabindex='0'><div tabindex='-1' style='width:1px;height:1px;' id='"+$t.p.knv+"'></div></div>"),
         | 
| 22379 22367 | 
             
            			i, kdir;
         | 
| 22380 22368 | 
             
            			function scrollGrid(iR, iC, tp){
         | 
| 22381 | 
            -
            				if (tp.substr(0,1) | 
| 22369 | 
            +
            				if (tp.substr(0,1)==='v') {
         | 
| 22382 22370 | 
             
            					var ch = $($t.grid.bDiv)[0].clientHeight,
         | 
| 22383 22371 | 
             
            					st = $($t.grid.bDiv)[0].scrollTop,
         | 
| 22384 22372 | 
             
            					nROT = $t.rows[iR].offsetTop+$t.rows[iR].clientHeight,
         | 
| 22385 22373 | 
             
            					pROT = $t.rows[iR].offsetTop;
         | 
| 22386 | 
            -
            					if(tp  | 
| 22374 | 
            +
            					if(tp === 'vd') {
         | 
| 22387 22375 | 
             
            						if(nROT >= ch) {
         | 
| 22388 22376 | 
             
            							$($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop + $t.rows[iR].clientHeight;
         | 
| 22389 22377 | 
             
            						}
         | 
| 22390 22378 | 
             
            					}
         | 
| 22391 | 
            -
            					if(tp  | 
| 22379 | 
            +
            					if(tp === 'vu'){
         | 
| 22392 22380 | 
             
            						if (pROT < st ) {
         | 
| 22393 22381 | 
             
            							$($t.grid.bDiv)[0].scrollTop = $($t.grid.bDiv)[0].scrollTop - $t.rows[iR].clientHeight;
         | 
| 22394 22382 | 
             
            						}
         | 
| 22395 22383 | 
             
            					}
         | 
| 22396 22384 | 
             
            				}
         | 
| 22397 | 
            -
            				if(tp | 
| 22385 | 
            +
            				if(tp==='h') {
         | 
| 22398 22386 | 
             
            					var cw = $($t.grid.bDiv)[0].clientWidth,
         | 
| 22399 22387 | 
             
            					sl = $($t.grid.bDiv)[0].scrollLeft,
         | 
| 22400 22388 | 
             
            					nCOL = $t.rows[iR].cells[iC].offsetLeft+$t.rows[iR].cells[iC].clientWidth,
         | 
| @@ -22408,7 +22396,7 @@ $.jgrid.extend({ | |
| 22408 22396 | 
             
            			}
         | 
| 22409 22397 | 
             
            			function findNextVisible(iC,act){
         | 
| 22410 22398 | 
             
            				var ind, i;
         | 
| 22411 | 
            -
            				if(act  | 
| 22399 | 
            +
            				if(act === 'lft') {
         | 
| 22412 22400 | 
             
            					ind = iC+1;
         | 
| 22413 22401 | 
             
            					for (i=iC;i>=0;i--){
         | 
| 22414 22402 | 
             
            						if ($t.p.colModel[i].hidden !== true) {
         | 
| @@ -22417,7 +22405,7 @@ $.jgrid.extend({ | |
| 22417 22405 | 
             
            						}
         | 
| 22418 22406 | 
             
            					}
         | 
| 22419 22407 | 
             
            				}
         | 
| 22420 | 
            -
            				if(act  | 
| 22408 | 
            +
            				if(act === 'rgt') {
         | 
| 22421 22409 | 
             
            					ind = iC-1;
         | 
| 22422 22410 | 
             
            					for (i=iC; i<$t.p.colModel.length;i++){
         | 
| 22423 22411 | 
             
            						if ($t.p.colModel[i].hidden !== true) {
         | 
| @@ -22434,7 +22422,7 @@ $.jgrid.extend({ | |
| 22434 22422 | 
             
            			.focus()
         | 
| 22435 22423 | 
             
            			.keydown(function (e){
         | 
| 22436 22424 | 
             
            				kdir = e.keyCode;
         | 
| 22437 | 
            -
            				if($t.p.direction  | 
| 22425 | 
            +
            				if($t.p.direction === "rtl") {
         | 
| 22438 22426 | 
             
            					if(kdir===37) { kdir = 39;}
         | 
| 22439 22427 | 
             
            					else if (kdir===39) { kdir = 37; }
         | 
| 22440 22428 | 
             
            				}
         | 
| @@ -22489,7 +22477,7 @@ $.jgrid.extend({ | |
| 22489 22477 | 
             
            					$('td',this).each( function(i) {
         | 
| 22490 22478 | 
             
            						nm = $t.p.colModel[i].name;
         | 
| 22491 22479 | 
             
            						if ( nm !== 'cb' && nm !== 'subgrid') {
         | 
| 22492 | 
            -
            							if (mthd | 
| 22480 | 
            +
            							if (mthd==='dirty') {
         | 
| 22493 22481 | 
             
            								if ($(this).hasClass('dirty-cell')) {
         | 
| 22494 22482 | 
             
            									try {
         | 
| 22495 22483 | 
             
            										res[nm] = $.unformat.call($t,this,{rowId:$t.rows[j].id, colModel:$t.p.colModel[i]},i);
         | 
| @@ -22845,7 +22833,7 @@ $.jgrid.extend({ | |
| 22845 22833 | 
             
            				var ind = $.jgrid.stripPref($t.p.idPrefix, $t.rows[i].id), dind = $t.p._index[ind], expan;
         | 
| 22846 22834 | 
             
            				ldat = $t.p.data[dind];
         | 
| 22847 22835 | 
             
            				//$t.rows[i].level = ldat[level];
         | 
| 22848 | 
            -
            				if($t.p.treeGridModel  | 
| 22836 | 
            +
            				if($t.p.treeGridModel === 'nested') {
         | 
| 22849 22837 | 
             
            					if(!ldat[isLeaf]) {
         | 
| 22850 22838 | 
             
            					lft = parseInt(ldat[$t.p.treeReader.left_field],10);
         | 
| 22851 22839 | 
             
            					rgt = parseInt(ldat[$t.p.treeReader.right_field],10);
         | 
| @@ -22866,17 +22854,17 @@ $.jgrid.extend({ | |
| 22866 22854 | 
             
            					lftpos = curLevel -1;
         | 
| 22867 22855 | 
             
            				}
         | 
| 22868 22856 | 
             
            				twrap = "<div class='tree-wrap tree-wrap-"+$t.p.direction+"' style='width:"+(ident*18)+"px;'>";
         | 
| 22869 | 
            -
            				twrap += "<div style='"+($t.p.direction | 
| 22857 | 
            +
            				twrap += "<div style='"+($t.p.direction==="rtl" ? "right:" : "left:")+(lftpos*18)+"px;' class='ui-icon ";
         | 
| 22870 22858 |  | 
| 22871 22859 |  | 
| 22872 22860 | 
             
            				if(ldat[loaded] !== undefined) {
         | 
| 22873 | 
            -
            					if(ldat[loaded] | 
| 22861 | 
            +
            					if(ldat[loaded]==="true" || ldat[loaded]===true) {
         | 
| 22874 22862 | 
             
            						ldat[loaded] = true;
         | 
| 22875 22863 | 
             
            					} else {
         | 
| 22876 22864 | 
             
            						ldat[loaded] = false;
         | 
| 22877 22865 | 
             
            					}
         | 
| 22878 22866 | 
             
            				}
         | 
| 22879 | 
            -
            				if(ldat[isLeaf]  | 
| 22867 | 
            +
            				if(ldat[isLeaf] === "true" || ldat[isLeaf] === true) {
         | 
| 22880 22868 | 
             
            					twrap += ((ldat[icon] !== undefined && ldat[icon] !== "") ? ldat[icon] : $t.p.treeIcons.leaf)+" tree-leaf treeclick";
         | 
| 22881 22869 | 
             
            					ldat[isLeaf] = true;
         | 
| 22882 22870 | 
             
            					lf="leaf";
         | 
| @@ -22884,7 +22872,7 @@ $.jgrid.extend({ | |
| 22884 22872 | 
             
            					ldat[isLeaf] = false;
         | 
| 22885 22873 | 
             
            					lf="";
         | 
| 22886 22874 | 
             
            				}
         | 
| 22887 | 
            -
            				ldat[expanded] = ((ldat[expanded]  | 
| 22875 | 
            +
            				ldat[expanded] = ((ldat[expanded] === "true" || ldat[expanded] === true) ? true : false) && (ldat[loaded] || ldat[loaded] === undefined);
         | 
| 22888 22876 | 
             
            				if(ldat[expanded] === false) {
         | 
| 22889 22877 | 
             
            					twrap += ((ldat[isLeaf] === true) ? "'" : $t.p.treeIcons.plus+" tree-plus treeclick'");
         | 
| 22890 22878 | 
             
            				} else {
         | 
| @@ -22955,9 +22943,9 @@ $.jgrid.extend({ | |
| 22955 22943 | 
             
            			if($t.p.rowTotal === null ) { $t.p.rowNum = 10000; }
         | 
| 22956 22944 | 
             
            			$t.p.multiselect = false;$t.p.rowList = [];
         | 
| 22957 22945 | 
             
            			$t.p.expColInd = 0;
         | 
| 22958 | 
            -
            			pico = 'ui-icon-triangle-1-' + ($t.p.direction | 
| 22946 | 
            +
            			pico = 'ui-icon-triangle-1-' + ($t.p.direction==="rtl" ? 'w' : 'e');
         | 
| 22959 22947 | 
             
            			$t.p.treeIcons = $.extend({plus:pico,minus:'ui-icon-triangle-1-s',leaf:'ui-icon-radio-off'},$t.p.treeIcons || {});
         | 
| 22960 | 
            -
            			if($t.p.treeGridModel  | 
| 22948 | 
            +
            			if($t.p.treeGridModel === 'nested') {
         | 
| 22961 22949 | 
             
            				$t.p.treeReader = $.extend({
         | 
| 22962 22950 | 
             
            					level_field: "level",
         | 
| 22963 22951 | 
             
            					left_field:"lft",
         | 
| @@ -22967,7 +22955,7 @@ $.jgrid.extend({ | |
| 22967 22955 | 
             
            					loaded: "loaded",
         | 
| 22968 22956 | 
             
            					icon_field: "icon"
         | 
| 22969 22957 | 
             
            				},$t.p.treeReader);
         | 
| 22970 | 
            -
            			} else if($t.p.treeGridModel  | 
| 22958 | 
            +
            			} else if($t.p.treeGridModel === 'adjacency') {
         | 
| 22971 22959 | 
             
            				$t.p.treeReader = $.extend({
         | 
| 22972 22960 | 
             
            						level_field: "level",
         | 
| 22973 22961 | 
             
            						parent_id_field: "parent",
         | 
| @@ -22980,14 +22968,14 @@ $.jgrid.extend({ | |
| 22980 22968 | 
             
            			for ( key in $t.p.colModel){
         | 
| 22981 22969 | 
             
            				if($t.p.colModel.hasOwnProperty(key)) {
         | 
| 22982 22970 | 
             
            					nm = $t.p.colModel[key].name;
         | 
| 22983 | 
            -
            					if( nm  | 
| 22971 | 
            +
            					if( nm === $t.p.ExpandColumn && !ecol ) {
         | 
| 22984 22972 | 
             
            						ecol = true;
         | 
| 22985 22973 | 
             
            						$t.p.expColInd = i;
         | 
| 22986 22974 | 
             
            					}
         | 
| 22987 22975 | 
             
            					i++;
         | 
| 22988 22976 | 
             
            					//
         | 
| 22989 22977 | 
             
            					for(tkey in $t.p.treeReader) {
         | 
| 22990 | 
            -
            						if($t.p.treeReader.hasOwnProperty(tkey) && $t.p.treeReader[tkey]  | 
| 22978 | 
            +
            						if($t.p.treeReader.hasOwnProperty(tkey) && $t.p.treeReader[tkey] === nm) {
         | 
| 22991 22979 | 
             
            							dupcols.push(nm);
         | 
| 22992 22980 | 
             
            						}
         | 
| 22993 22981 | 
             
            					}
         | 
| @@ -23055,7 +23043,7 @@ $.jgrid.extend({ | |
| 23055 23043 | 
             
            				case 'adjacency' :
         | 
| 23056 23044 | 
             
            					var parent_id = $t.p.treeReader.parent_id_field;
         | 
| 23057 23045 | 
             
            					$($t.p.data).each(function(){
         | 
| 23058 | 
            -
            						if(this[parent_id] === null || String(this[parent_id]).toLowerCase()  | 
| 23046 | 
            +
            						if(this[parent_id] === null || String(this[parent_id]).toLowerCase() === "null") {
         | 
| 23059 23047 | 
             
            							result.push(this);
         | 
| 23060 23048 | 
             
            						}
         | 
| 23061 23049 | 
             
            					});
         | 
| @@ -23249,14 +23237,14 @@ $.jgrid.extend({ | |
| 23249 23237 | 
             
            					$("div.treeclick",rc1).removeClass(this.p.treeIcons.plus+" tree-plus").addClass(this.p.treeIcons.minus+" tree-minus");
         | 
| 23250 23238 | 
             
            					this.p.treeANode = rc1.rowIndex;
         | 
| 23251 23239 | 
             
            					this.p.datatype = this.p.treedatatype;
         | 
| 23252 | 
            -
            					if(this.p.treeGridModel  | 
| 23240 | 
            +
            					if(this.p.treeGridModel === 'nested') {
         | 
| 23253 23241 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:id,n_left:rc[lft],n_right:rc[rgt],n_level:rc[level]}});
         | 
| 23254 23242 | 
             
            					} else {
         | 
| 23255 23243 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:id,parentid:rc[parent],n_level:rc[level]}} );
         | 
| 23256 23244 | 
             
            					}
         | 
| 23257 23245 | 
             
            					$(this).trigger("reloadGrid");
         | 
| 23258 23246 | 
             
            					rc[loaded] = true;
         | 
| 23259 | 
            -
            					if(this.p.treeGridModel  | 
| 23247 | 
            +
            					if(this.p.treeGridModel === 'nested') {
         | 
| 23260 23248 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:'',n_left:'',n_right:'',n_level:''}});
         | 
| 23261 23249 | 
             
            					} else {
         | 
| 23262 23250 | 
             
            						$(this).jqGrid("setGridParam",{postData:{nodeid:'',parentid:'',n_level:''}}); 
         | 
| @@ -23929,7 +23917,7 @@ $.jgrid.extend({ | |
| 23929 23917 | 
             
            			var res = funcs[fn]();
         | 
| 23930 23918 |  | 
| 23931 23919 | 
             
            			if (round != null) {
         | 
| 23932 | 
            -
            				if (roundType  | 
| 23920 | 
            +
            				if (roundType === 'fixed') {
         | 
| 23933 23921 | 
             
            					res = res.toFixed(round);
         | 
| 23934 23922 | 
             
            				} else {
         | 
| 23935 23923 | 
             
            					var mul = Math.pow(10, round);
         | 
| @@ -24522,7 +24510,7 @@ $.jgrid.extend({ | |
| 24522 24510 | 
             
            						// drag and drop does not insert tr in table, when the table has no rows
         | 
| 24523 24511 | 
             
            						// we try to insert new empty row on the target(s)
         | 
| 24524 24512 | 
             
            						for (i=0;i<$.data($t,"dnd").connectWith.length;i++){
         | 
| 24525 | 
            -
            							if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount')  | 
| 24513 | 
            +
            							if($($.data($t,"dnd").connectWith[i]).jqGrid('getGridParam','reccount') === 0 ){
         | 
| 24526 24514 | 
             
            								$($.data($t,"dnd").connectWith[i]).jqGrid('addRowData','jqg_empty_row',{});
         | 
| 24527 24515 | 
             
            							}
         | 
| 24528 24516 | 
             
            						}
         | 
| @@ -24630,7 +24618,7 @@ $.jgrid.extend({ | |
| 24630 24618 | 
             
            		opts.connectWith = $.map(opts.connectWith,function(n){return $.trim(n);});
         | 
| 24631 24619 | 
             
            		$.data($t,"dnd",opts);
         | 
| 24632 24620 |  | 
| 24633 | 
            -
            		if($t.p.reccount  | 
| 24621 | 
            +
            		if($t.p.reccount !== 0 && !$t.p.jqgdnd) {
         | 
| 24634 24622 | 
             
            			updateDnD();
         | 
| 24635 24623 | 
             
            		}
         | 
| 24636 24624 | 
             
            		$t.p.jqgdnd = true;
         |