From 7584347e39470275e95a259b58987304f8b7bfca Mon Sep 17 00:00:00 2001 From: "Dr. Oleg Kiriljuk" Date: Wed, 19 Dec 2012 23:18:33 +0100 Subject: [PATCH] Update js/grid.filter.js --- js/grid.filter.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/grid.filter.js b/js/grid.filter.js index b04fdbfff..26caf6cb9 100644 --- a/js/grid.filter.js +++ b/js/grid.filter.js @@ -25,9 +25,11 @@ ] } */ -/*global jQuery, $, window, navigator */ +/*jshint eqeqeq:false, eqnull:true, devel:true */ +/*global jQuery */ (function ($) { +"use strict"; $.fn.jqFilter = function( arg ) { if (typeof arg === 'string') { @@ -426,8 +428,8 @@ $.fn.jqFilter = function( arg ) { var j=0; for (i = 0; i < that.p.columns.length; i++) { // but show only serchable and serchhidden = true fields - var searchable = (that.p.columns[i].search === undefined) ? true: that.p.columns[i].search , - hidden = (that.p.columns[i].hidden === true), + var searchable = (that.p.columns[i].search === undefined) ? true: that.p.columns[i].search, + hidden = (that.p.columns[i].hidden === true), ignoreHiding = (that.p.columns[i].searchoptions.searchhidden === true); if ((ignoreHiding && searchable) || (searchable && !hidden)) { selected = ""; @@ -455,9 +457,9 @@ $.fn.jqFilter = function( arg ) { } var ruleDataInput = $.jgrid.createEl(cm.inputtype,cm.searchoptions, rule.data, true, that.p.ajaxSelectOptions, true); if(rule.op == 'nu' || rule.op == 'nn') { - $(ruleDataInput).attr('readonly','true'); - $(ruleDataInput).attr('disabled','true'); - } //retain the state of disabled text fields in case of null ops + $(ruleDataInput).attr('readonly','true'); + $(ruleDataInput).attr('disabled','true'); + } //retain the state of disabled text fields in case of null ops // dropdown for: choosing operator var ruleOperatorSelect = $(""); ruleOperatorTd.append(ruleOperatorSelect); @@ -718,7 +720,7 @@ $.extend($.fn.jqFilter,{ }, addFilter: function (pfilter) { if (typeof pfilter === "string") { - pfilter = jQuery.jgrid.parse( pfilter ); + pfilter = $.jgrid.parse( pfilter ); } this.each(function(){ this.p.filter = pfilter; @@ -729,4 +731,3 @@ $.extend($.fn.jqFilter,{ }); })(jQuery); -