compass-jquery-plugin 0.3.0.beta.2 → 0.3.0.beta.4

data/templates/jqgrid/jquery.jqGrid.js

@@ -4,8 +4,8 @@
  * Copyright (c) 2008, Tony Tomov, tony@trirand.com
  * Dual licensed under the MIT and GPL licenses
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * Date: 2010-02-14
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ * Date: 2010-02-14 
  */
 $.jgrid = $.jgrid || {};
 $.extend($.jgrid,{
@@ -34,7 +34,7 @@ $.extend($.jgrid,{
 		var regexp = /<("[^"]*"|'[^']*'|[^'">])*>/gi;
 		if (v) {
 			v = v.replace(regexp,"");
-			return (v && v !== '&nbsp;' && v !== '&#160;') ? v : "";
+			return (v && v !== '&nbsp;' && v !== '&#160;') ? v.replace(/\"/g,"'") : "";
 		} else {
 			return v;
 		}
@@ -811,13 +811,12 @@ $.fn.jqGrid = function( pin ) {
 						type:ts.p.mtype,
 						dataType: dt ,
 						data: $.isFunction(ts.p.serializeGridData)? ts.p.serializeGridData.call(ts,ts.p.postData) : ts.p.postData,
-						complete:function(req,st) {
-							if(st=="success" || (req.statusText == "OK" && req.status == "200")) {
-								if(dt === "xml") { addXmlData(req.responseXML,ts.grid.bDiv,rcnt,npage>1,adjust); }
-								else { addJSONData($.jgrid.parse(req.responseText),ts.grid.bDiv,rcnt,npage>1,adjust); }
-								if(lc) { lc.call(ts,req); }
-								if (pvis) { ts.grid.populateVisible(); }
-							}
+						success:function(req,st) {
+							if(dt === "xml") { addXmlData(req,ts.grid.bDiv,rcnt,npage>1,adjust); }
+							else { addJSONData(req,ts.grid.bDiv,rcnt,npage>1,adjust); }
+							if(lc) { lc.call(ts,req); }
+							if (pvis) { ts.grid.populateVisible(); }
+							if( ts.p.loadonce || ts.p.treeGrid) {ts.p.datatype = "local";}
 							req=null;
 							endReq();
 						},
@@ -831,7 +830,6 @@ $.fn.jqGrid = function( pin ) {
 							if($.isFunction(ts.p.loadBeforeSend)) { ts.p.loadBeforeSend.call(ts,xhr); }
 						}
 					},$.jgrid.ajaxOptions, ts.p.ajaxGridOptions));
-					if( ts.p.loadonce || ts.p.treeGrid) {ts.p.datatype = "local";}
 				break;
 				case "xmlstring":
 					beginReq();
@@ -918,6 +916,8 @@ $.fn.jqGrid = function( pin ) {
 					var fd = ts.p.colModel[col].datefmt || "Y-m-d";
 					return parseDate(fd,$cell).getTime();
 				};
+			} else if($.isFunction(st)) {
+				findSortKey = st;
 			} else {
 				findSortKey = function($cell) {
 					return $.trim($cell.toUpperCase());
@@ -927,7 +927,7 @@ $.fn.jqGrid = function( pin ) {
 			$.each(ts.rows, function(index, row) {
 				try { sv = $.unformat($(row).children('td').eq(col),{rowId:row.id, colModel:cm},col,true);}
 				catch (_) { sv = $(row).children('td').eq(col).text(); }
-				row.sortKey = cm.custom_sort === undefined ?  findSortKey(sv) : cm.custom_sort.call(ts,sv);
+				row.sortKey = findSortKey(sv);
 				rows[index] = this;
 			});
 			if(ts.p.treeGrid) {
@@ -1128,7 +1128,7 @@ $.fn.jqGrid = function( pin ) {
 					if( ts.p.sortorder == 'asc') {
 						ts.p.sortorder = 'desc';
 					} else if(ts.p.sortorder == 'desc') { ts.p.sortorder = 'asc';}
-				} else { ts.p.sortorder = 'asc';}
+				} else { ts.p.sortorder = ts.p.colModel[idxcol].firstsortorder || 'asc'; }
 				ts.p.page = 1;
 			}
 			if(sor) {
@@ -1328,8 +1328,7 @@ $.fn.jqGrid = function( pin ) {
 		$(this).append(thead);
 		$("thead tr:first th",this).hover(function(){$(this).addClass('ui-state-hover');},function(){$(this).removeClass('ui-state-hover');});
 		if(this.p.multiselect) {
-			var onSA = true, emp=[], chk;
-			if(typeof ts.p.onSelectAll !== 'function') {onSA=false;}
+			var emp=[], chk;
 			$('#cb_'+$.jgrid.jqID(ts.p.id),this).bind('click',function(){
 				if (this.checked) {
 					$("[id^=jqg_]",ts.rows).attr("checked",true);
@@ -1353,7 +1352,7 @@ $.fn.jqGrid = function( pin ) {
 					ts.p.selarrrow = []; ts.p.selrow = null;
 					chk=false;
 				}
-				if(onSA) {ts.p.onSelectAll.call(ts, chk ? ts.p.selarrrow : emp,chk);}
+				if($.isFunction(ts.p.onSelectAll)) {ts.p.onSelectAll.call(ts, chk ? ts.p.selarrrow : emp,chk);}
 			});
 		}
 		
@@ -2370,7 +2369,7 @@ $.jgrid.extend({
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/ 
 /**
  * all events and options here are aded anonynous and not in the base grid
@@ -2853,7 +2852,7 @@ $.jgrid.extend({
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 */ 
 // Modal functions
 var showModal = function(h) {
@@ -3485,7 +3484,7 @@ function checkValues(val, valref,g) {
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/ 
 $.jgrid.extend({
 	getColProp : function(colname){
@@ -4302,7 +4301,7 @@ $.jgrid.extend({
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/
 var rp_ge = null;
 $.jgrid.extend({
@@ -4314,7 +4313,7 @@ $.jgrid.extend({
 			sValue:'searchString',
 			sOper: 'searchOper',
 			sFilter: 'filters',
-            loadDefaults: false, // this options activates loading of default filters from grid's postData for Multipe Search only.
+            loadDefaults: true, // this options activates loading of default filters from grid's postData for Multipe Search only.
 			beforeShowSearch: null,
 			afterShowSearch : null,
 			onInitializeSearch: null,
@@ -4379,16 +4378,19 @@ $.jgrid.extend({
                         gridDOMobj.SearchFilter.setGroupOp(defaultFilters.groupOp);
                     }
                     if (defaultFilters.rules) {
-                        var f;
-                        for (var i = 0, li = defaultFilters.rules.length; i < li; i++) {
+                        var f
+							, i = 0
+							, li = defaultFilters.rules.length
+							, success = false;
+                        for (; i < li; i++) {
                             f = defaultFilters.rules[i];
                             // we are not trying to counter all issues with filter declaration here. Just the basics to avoid lookup exceptions.
                             if (f.field !== undefined && f.op !== undefined && f.data !== undefined) {
-                                gridDOMobj.SearchFilter.setFilter({
+                                success = gridDOMobj.SearchFilter.setFilter({
                                     'sfref':gridDOMobj.SearchFilter.$.find(".sf:last"),
                                     'filter':$.extend({},f)
                                 });
-                                gridDOMobj.SearchFilter.add();
+								if (success) { gridDOMobj.SearchFilter.add(); }
                             }
                         }
                     }
@@ -4407,10 +4409,8 @@ $.jgrid.extend({
 					colNames = $("#"+$t.p.id).jqGrid("getGridParam","colNames"),
 					colModel = $("#"+$t.p.id).jqGrid("getGridParam","colModel"),
 					stempl = ['eq','ne','lt','le','gt','ge','bw','bn','in','ni','ew','en','cn','nc'],
-					j,pos,k,oprtr;
-					oprtr = jQuery.fn.searchFilter.defaults.operators;
+					j,pos,k,oprtr=[];
 					if (p.sopt !==null) {
-						oprtr = [];
 						k=0;
 						for(j=0;j<p.sopt.length;j++) {
 							if( (pos= $.inArray(p.sopt[j],stempl)) != -1 ){
@@ -4418,6 +4418,10 @@ $.jgrid.extend({
 								k++;
 							}
 						}
+					} else {
+						for(j=0;j<stempl.length;j++) {
+							oprtr[j] = {op:stempl[j],text: p.odata[j]};
+						}
 					}
 					var searchable;
 				    $.each(colModel, function(i, v) {
@@ -4425,14 +4429,15 @@ $.jgrid.extend({
 				        hidden = (v.hidden === true),
 						soptions = $.extend({}, {text: colNames[i], itemval: v.index || v.name}, this.searchoptions),
 						ignoreHiding = (soptions.searchhidden === true);
-						if(typeof soptions.sopt == 'undefined') { soptions.sopt = p.sopt ||  stempl; }
-						k=0;
-						soptions.ops =[];
-						if(soptions.sopt.length>0) {
-							for(j=0;j<soptions.sopt.length;j++) {
-								if( (pos= $.inArray(soptions.sopt[j],stempl)) != -1 ){
-									soptions.ops[k] = {op:soptions.sopt[j],text: p.odata[pos]};
-									k++;
+						if(typeof soptions.sopt !== 'undefined') { 
+							k=0;
+							soptions.ops =[];
+							if(soptions.sopt.length>0) {
+								for(j=0;j<soptions.sopt.length;j++) {
+									if( (pos= $.inArray(soptions.sopt[j],stempl)) != -1 ){
+										soptions.ops[k] = {op:soptions.sopt[j],text: p.odata[pos]};
+										k++;
+									}
 								}
 							}
 						}
@@ -5871,13 +5876,20 @@ $.jgrid.extend({
 					$(tbd,navtbl)
 					.attr({"title":o.addtitle || "",id : pAdd.id || "add_"+elemids})
 					.click(function(){
-						if (typeof o.addfunc == 'function') {
-							o.addfunc();
-						} else {
-							$($t).jqGrid("editGridRow","new",pAdd);
+						if (!$(this).hasClass('ui-state-disabled')) {
+							if (typeof o.addfunc == 'function') {
+								o.addfunc();
+							} else {
+								$($t).jqGrid("editGridRow","new",pAdd);
+							}
 						}
 						return false;
-					}).hover(function () {$(this).addClass("ui-state-hover");},
+					}).hover(
+						function () {
+							if (!$(this).hasClass('ui-state-disabled')) {
+								$(this).addClass("ui-state-hover");
+							}
+						},
 						function () {$(this).removeClass("ui-state-hover");}
 					);
 					tbd = null;
@@ -5890,19 +5902,26 @@ $.jgrid.extend({
 					$(tbd,navtbl)
 					.attr({"title":o.edittitle || "",id: pEdit.id || "edit_"+elemids})
 					.click(function(){
-						var sr = $t.p.selrow;
-						if (sr) {
-							if(typeof o.editfunc == 'function') {
-								o.editfunc(sr);
+						if (!$(this).hasClass('ui-state-disabled')) {
+							var sr = $t.p.selrow;
+							if (sr) {
+								if(typeof o.editfunc == 'function') {
+									o.editfunc(sr);
+								} else {
+									$($t).jqGrid("editGridRow",sr,pEdit);
+								}
 							} else {
-								$($t).jqGrid("editGridRow",sr,pEdit);
+								viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true});
+								$("#jqg_alrt").focus();
 							}
-						} else {
-							viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true});
-							$("#jqg_alrt").focus();
 						}
 						return false;
-					}).hover( function () {$(this).addClass("ui-state-hover");},
+					}).hover(
+						function () {
+							if (!$(this).hasClass('ui-state-disabled')) {
+								$(this).addClass("ui-state-hover");
+							}
+						},
 						function () {$(this).removeClass("ui-state-hover");}
 					);
 					tbd = null;
@@ -5915,15 +5934,22 @@ $.jgrid.extend({
 					$(tbd,navtbl)
 					.attr({"title":o.viewtitle || "",id: pView.id || "view_"+elemids})
 					.click(function(){
-						var sr = $t.p.selrow;
-						if (sr) {
-							$($t).jqGrid("viewGridRow",sr,pView);
-						} else {
-							viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true});
-							$("#jqg_alrt").focus();
+						if (!$(this).hasClass('ui-state-disabled')) {
+							var sr = $t.p.selrow;
+							if (sr) {
+								$($t).jqGrid("viewGridRow",sr,pView);
+							} else {
+								viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true});
+								$("#jqg_alrt").focus();
+							}
 						}
 						return false;
-					}).hover( function () {$(this).addClass("ui-state-hover");},
+					}).hover(
+						function () {
+							if (!$(this).hasClass('ui-state-disabled')) {
+								$(this).addClass("ui-state-hover");
+							}
+						},
 						function () {$(this).removeClass("ui-state-hover");}
 					);
 					tbd = null;
@@ -5936,24 +5962,31 @@ $.jgrid.extend({
 					$(tbd,navtbl)
 					.attr({"title":o.deltitle || "",id: pDel.id || "del_"+elemids})
 					.click(function(){
-						var dr;
-						if($t.p.multiselect) {
-							dr = $t.p.selarrrow;
-							if(dr.length===0) { dr = null; }
-						} else {
-							dr = $t.p.selrow;
-						}
-						if(dr){
-							if("function" == typeof o.delfunc){
-								o.delfunc(dr);
-							}else{
-								$($t).jqGrid("delGridRow",dr,pDel);
+						if (!$(this).hasClass('ui-state-disabled')) {
+							var dr;
+							if($t.p.multiselect) {
+								dr = $t.p.selarrrow;
+								if(dr.length===0) { dr = null; }
+							} else {
+								dr = $t.p.selrow;
+							}
+							if(dr){
+								if("function" == typeof o.delfunc){
+									o.delfunc(dr);
+								}else{
+									$($t).jqGrid("delGridRow",dr,pDel);
+								}
+							} else  {
+								viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true}); $("#jqg_alrt").focus();
 							}
-						} else  {
-							viewModal("#"+alertIDs.themodal,{gbox:"#gbox_"+$t.p.id,jqm:true}); $("#jqg_alrt").focus();
 						}
 						return false;
-					}).hover(function () {$(this).addClass("ui-state-hover");},
+					}).hover(
+						function () {
+							if (!$(this).hasClass('ui-state-disabled')) {
+								$(this).addClass("ui-state-hover");
+							}
+						},
 						function () {$(this).removeClass("ui-state-hover");}
 					);
 					tbd = null;
@@ -5967,9 +6000,16 @@ $.jgrid.extend({
 					$(tbd,navtbl)
 					.attr({"title":o.searchtitle  || "",id:pSearch.id || "search_"+elemids})
 					.click(function(){
-						$($t).jqGrid("searchGrid",pSearch);
+						if (!$(this).hasClass('ui-state-disabled')) {
+							$($t).jqGrid("searchGrid",pSearch);
+						}
 						return false;
-					}).hover(function () {$(this).addClass("ui-state-hover");},
+					}).hover(
+						function () {
+							if (!$(this).hasClass('ui-state-disabled')) {
+								$(this).addClass("ui-state-hover");
+							}
+						},
 						function () {$(this).removeClass("ui-state-hover");}
 					);
 					tbd = null;
@@ -5981,24 +6021,31 @@ $.jgrid.extend({
 					$(tbd,navtbl)
 					.attr({"title":o.refreshtitle  || "",id: "refresh_"+elemids})
 					.click(function(){
-						if($.isFunction(o.beforeRefresh)) { o.beforeRefresh(); }
-						$t.p.search = false;
-						try {
-							var gID = $t.p.id;
-							$("#fbox_"+gID).searchFilter().reset();
-	                        if($.isFunction($t.clearToolbar)) { $t.clearToolbar(false); }
-						} catch (e) {}
-						switch (o.refreshstate) {
-							case 'firstpage':
-							    $($t).trigger("reloadGrid", [{page:1}]);
-								break;
-							case 'current':
-							    $($t).trigger("reloadGrid", [{current:true}]);
-								break;
+						if (!$(this).hasClass('ui-state-disabled')) {
+							if($.isFunction(o.beforeRefresh)) { o.beforeRefresh(); }
+							$t.p.search = false;
+							try {
+								var gID = $t.p.id;
+								$("#fbox_"+gID).searchFilter().reset();
+							    if($.isFunction($t.clearToolbar)) { $t.clearToolbar(false); }
+							} catch (e) {}
+							switch (o.refreshstate) {
+								case 'firstpage':
+								    $($t).trigger("reloadGrid", [{page:1}]);
+									break;
+								case 'current':
+								    $($t).trigger("reloadGrid", [{current:true}]);
+									break;
+							}
+							if($.isFunction(o.afterRefresh)) { o.afterRefresh(); }
 						}
-						if($.isFunction(o.afterRefresh)) { o.afterRefresh(); }
 						return false;
-					}).hover(function () {$(this).addClass("ui-state-hover");},
+					}).hover(
+						function () {
+							if (!$(this).hasClass('ui-state-disabled')) {
+								$(this).addClass("ui-state-hover");
+							}
+						},
 						function () {$(this).removeClass("ui-state-hover");}
 					);
 					tbd = null;
@@ -6052,14 +6099,19 @@ $.jgrid.extend({
 				$(tbd,findnav)
 				.attr("title",p.title  || "")
 				.click(function(e){
-					if ($.isFunction(p.onClickButton) ) { p.onClickButton.call($t,e); }
+					if (!$(this).hasClass('ui-state-disabled')) {
+						if ($.isFunction(p.onClickButton) ) { p.onClickButton.call($t,e); }
+					}
 					return false;
 				})
 				.hover(
-					function () {$(this).addClass("ui-state-hover");},
+					function () {
+						if (!$(this).hasClass('ui-state-disabled')) {
+							$(this).addClass('ui-state-hover');
+						}
+					},
 					function () {$(this).removeClass("ui-state-hover");}
-				)
-				.css("cursor",p.cursor ? p.cursor : "normal");
+				);
 			}
 		});
 	},
@@ -6127,7 +6179,7 @@ $.jgrid.extend({
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/ 
     $.jgrid.extend({
         jqGridImport : function(o) {
@@ -6327,7 +6379,7 @@ $.jgrid.extend({
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/ 
 $.jgrid.extend({
 //Editing
@@ -6585,8 +6637,8 @@ $.jgrid.extend({
  * Author: Mark Williams
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
- * depends on jQuery UI sortable
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ * depends on jQuery UI 
 **/
 if ($.browser.msie && $.browser.version==8) {
 	$.expr[":"].hidden = function(elem) {
@@ -6595,6 +6647,7 @@ if ($.browser.msie && $.browser.version==8) {
 	};
 }
 // requiere load multiselect before grid
+$.jgrid._multiselect = false;
 if($.ui) {
 	if ($.ui.multiselect ) {
 		if($.ui.multiselect.prototype._setSelected) {
@@ -6623,6 +6676,7 @@ if($.ui) {
 	            }
 			};
 		}
+		$.jgrid._multiselect = true;
 	}
 }
         
@@ -6777,6 +6831,11 @@ $.jgrid.extend({
             },
 			"msel_opts" : {}
         }, $.jgrid.col, opts || {});
+		if(opts.msel == "multiselect" && !$.jgrid._multiselect) {
+			// should be in language file
+			alert("Multiselect plugin not loaded or loaded after jqGrid. Please load the plugin before the jqGrid!");
+			return;
+		}
 		if($.ui) {
 			if ($.ui.multiselect ) {
 				opts.msel_opts = $.extend($.ui.multiselect.defaults,opts.msel_opts);
@@ -7081,7 +7140,7 @@ $.jgrid.extend({
  * 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/ 
 $.jgrid.extend({
 	getPostData : function(){
@@ -7146,7 +7205,7 @@ $.jgrid.extend({
  * http://www.roznicki.prv.pl
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/
 $.jgrid.extend({
 	setColumns : function(p) {
@@ -7273,7 +7332,7 @@ $.jgrid.extend({
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/
 $.jgrid.extend({
 setSubGrid : function () {
@@ -7644,7 +7703,7 @@ jQuery(selector).each(function() {
  * http://trirand.com/blog/ 
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
 **/ 
 $.jgrid.extend({
 	setTreeNode : function(rd, row){
@@ -8232,7 +8291,7 @@ hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function()
  * Changes from Tony Tomov tony@trirand.com
  * Dual licensed under the MIT and GPL licenses:
  * http://www.opensource.org/licenses/mit-license.php
- * http://www.gnu.org/licenses/gpl.html
+ * http://www.gnu.org/licenses/gpl-2.0.html
  * 
 **/
 
@@ -8327,25 +8386,30 @@ hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function()
 				monthNames: opts.monthNames
 			};
 			if( format in opts.masks ) { format = opts.masks[format]; }
-			date = date.split(/[\\\/:_;.\t\T\s-]/);
-			format = format.split(/[\\\/:_;.\t\T\s-]/);
-			// parsing for month names
-		    for(k=0,hl=format.length;k<hl;k++){
-				if(format[k] == 'M') {
-					dM = $.inArray(date[k],dateFormat.i18n.monthNames);
-					if(dM !== -1 && dM < 12){date[k] = dM+1;}
-				}
-				if(format[k] == 'F') {
-					dM = $.inArray(date[k],dateFormat.i18n.monthNames);
-					if(dM !== -1 && dM > 11){date[k] = dM+1-12;}
-				}
-		        ts[format[k].toLowerCase()] = parseInt(date[k],10);
-		    }
-		    ts.m = parseInt(ts.m,10)-1;
-		    var ty = ts.y;
-		    if (ty >= 70 && ty <= 99) { ts.y = 1900+ts.y; }
-		    else if (ty >=0 && ty <=69) { ts.y= 2000+ts.y; }
-		    timestamp = new Date(ts.y, ts.m, ts.d, ts.h, ts.i, ts.s, ts.u);
+			if(date.constructor === Date) {
+				timestamp = date;
+			} else {
+				date = date.split(/[\\\/:_;.\t\T\s-]/);
+				format = format.split(/[\\\/:_;.\t\T\s-]/);
+				// parsing for month names
+				for(k=0,hl=format.length;k<hl;k++){
+					if(format[k] == 'M') {
+						dM = $.inArray(date[k],dateFormat.i18n.monthNames);
+						if(dM !== -1 && dM < 12){date[k] = dM+1;}
+					}
+					if(format[k] == 'F') {
+						dM = $.inArray(date[k],dateFormat.i18n.monthNames);
+						if(dM !== -1 && dM > 11){date[k] = dM+1-12;}
+					}
+				    ts[format[k].toLowerCase()] = parseInt(date[k],10);
+				}
+				ts.m = parseInt(ts.m,10)-1;
+				var ty = ts.y;
+				if (ty >= 70 && ty <= 99) { ts.y = 1900+ts.y; }
+				else if (ty >=0 && ty <=69) { ts.y= 2000+ts.y; }
+				timestamp = new Date(ts.y, ts.m, ts.d, ts.h, ts.i, ts.s, ts.u);
+			}
+			
 			if( newformat in opts.masks )  {
 				newformat = opts.masks[newformat];
 			} else if ( !newformat ) {
@@ -8636,7 +8700,7 @@ hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function()
 					ret= $(cellval).text();
 			}
 		}
-		return ret ? ret : cnt===true ? $(cellval).text() : $(cellval).html();
+		return ret ? ret : cnt===true ? $(cellval).text() : $.jgrid.htmlDecode($(cellval).html());
 	};
 	$.unformat.select = function (cellval,options,pos,cnt) {
 		// Spacial case when we have local data and perform a sort
@@ -8745,7 +8809,7 @@ hs=function(w,t,c){return w.each(function(){var s=this._jqm;$(t).each(function()
 
 /* Plugin:      searchFilter v1.2.9
  * Author:      Kasey Speakman (kasey@cornerspeed.com)
- * License:     Dual Licensed, MIT and GPL v2 (http://www.gnu.org/copyleft/gpl.html)
+ * License:     Dual Licensed, MIT and GPL v2 (http://www.gnu.org/licenses/gpl-2.0.html)
  *
  * REQUIREMENTS:
  *    jQuery 1.3+           (http://jquery.com/)
@@ -9232,7 +9296,7 @@ jQuery.fn.searchFilter = function(fields, options) {
                 }
                 selDOMobj.selectedIndex = indexmap[setting];
                 $(selDOMobj).change();
-            }
+            };
 
             this.setFilter = function(settings) {
                 /* a "setter" for an arbitrary SearchFilter's filter line.
@@ -9257,27 +9321,27 @@ jQuery.fn.searchFilter = function(fields, options) {
                 var o = settings['sfref'], filter = settings['filter'];
                 
                 // setting up valueindexmap that we will need to manipulate SELECT elements.
-                var fields = [],
+                var fields = [], i, j , l, lj, li,
                     valueindexmap = {};
                     // example of valueindexmap:
                     // {'field1':{'index':0,'ops':{'eq':0,'ne':1}},'fieldX':{'index':1,'ops':{'eq':0,'ne':1},'data':{'true':0,'false':1}}},
                     // if data is undefined it's a INPUT field. If defined, it's SELECT
                 selDOMobj = o.find("select[name='field']")[0];
-                for (var i=0, l=selDOMobj.options.length; i<l; i++) {
+                for (i=0, l=selDOMobj.options.length; i<l; i++) {
                     valueindexmap[selDOMobj.options[i].value] = {'index':i,'ops':{}};
                     fields.push(selDOMobj.options[i].value);
                 }
-                for (var i=0, li=fields.length; i < li; i++) {
+                for (i=0, li=fields.length; i < li; i++) {
                     selDOMobj = o.find(".ops > select[class='field"+i+"']")[0];
                     if (selDOMobj) {
-                        for (var j=0, lj=selDOMobj.options.length; j<lj; j++) {
+                        for (j=0, lj=selDOMobj.options.length; j<lj; j++) {
                             valueindexmap[fields[i]]['ops'][selDOMobj.options[j].value] = j;
                         }
                     }
                     selDOMobj = o.find(".data > select[class='field"+i+"']")[0];
                     if (selDOMobj) {
                         valueindexmap[fields[i]]['data'] = {}; // this setting is the flag that 'data' is contained in a SELECT
-                        for (var j=0, lj=selDOMobj.options.length; j<lj; j++) {
+                        for (j=0, lj=selDOMobj.options.length; j<lj; j++) {
                             valueindexmap[fields[i]]['data'][selDOMobj.options[j].value] = j;
                         }
                     }
@@ -9286,19 +9350,28 @@ jQuery.fn.searchFilter = function(fields, options) {
                 // preparsing the index values for SELECT elements.
                 var fieldvalue, fieldindex, opindex, datavalue, dataindex;
                 fieldvalue = filter['field'];
-                fieldindex = valueindexmap[fieldvalue]['index'];
-                if (fieldindex != undefined) {
+				if (valueindexmap[fieldvalue]) {
+					fieldindex = valueindexmap[fieldvalue]['index'];
+				}
+                if (fieldindex != null) {
                     opindex = valueindexmap[fieldvalue]['ops'][filter['op']];
+                    if(opindex === undefined) {
+                        for(i=0,li=options.operators.length; i<li;i++) {
+                            if(options.operators[i].op == filter.op ){
+                                opindex = i;
+                                break;
+                            }
+                        }
+                    }
                     datavalue = filter['data'];
-                    if (valueindexmap[fieldvalue]['data'] == undefined) {
+                    if (valueindexmap[fieldvalue]['data'] == null) {
                         dataindex = -1; // 'data' is not SELECT, Making the var 'defined'
                     } else {
                         dataindex = valueindexmap[fieldvalue]['data'][datavalue]; // 'undefined' may come from here.
                     }
                 }
-
                 // only if values for 'field' and 'op' and 'data' are 'found' in mapping...
-                if (fieldindex != undefined && opindex != undefined && dataindex != undefined) {
+                if (fieldindex != null && opindex != null && dataindex != null) {
                     o.find("select[name='field']")[0].selectedIndex = fieldindex;
                     o.find("select[name='field']").change();
                     o.find("select[name='op']")[0].selectedIndex = opindex;
@@ -9307,8 +9380,11 @@ jQuery.fn.searchFilter = function(fields, options) {
                     if (o) {
                         o.selectedIndex = dataindex;
                     }
-                }
-            } // end of this.setFilter fn
+					return true
+                } else {
+					return false
+				}
+            }; // end of this.setFilter fn
         } // end of if fields != null
     }
     return new SearchFilter(this, fields, options);