@@ -321,7 +321,12 @@ function createEl(eltype,options,vl,autowidth, ajaxso) {
data : {nd:new Date().getTime()},
complete: function(data,status){
try {delete options['dataUrl'];delete options['value'];} catch (e){}
- var a = jQuery(data.responseText).html();
+ var a;
+ if(options.buildSelect != null) {
+ var b = options.buildSelect(data);
+ a = jQuery(b).html();
+ } else
+ a = jQuery(data.responseText).html();
if(a) {
jQuery(elem).append(a);
options = bindEv(elem,options);
js/grid.common.js
@@ -556,8 +556,9 @@ $.jgrid.extend({
saveurl = $t.p.url;
$($t).jqGrid("setGridParam",{url:$t.p.searchurl});
}
- if($.isFunction(p.beforeSearch)){p.beforeSearch.call($t);}
- $($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
+ var bsr = false;
+ if($.isFunction(p.beforeSearch)){bsr = p.beforeSearch.call($t);}
+ if(!bsr) $($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});}
if($.isFunction(p.afterSearch)){p.afterSearch();}
};
@@ -607,8 +608,9 @@ $.jgrid.extend({
saveurl = $t.p.url;
$($t).jqGrid("setGridParam",{url:$t.p.searchurl});
}
- if($.isFunction(p.beforeClear)){p.beforeClear.call($t);}
- $($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
+ var bcv = false;
+ if($.isFunction(p.beforeClear)){bcv = p.beforeClear.call($t);}
+ if(!bcv) $($t).jqGrid("setGridParam",{search:sd}).trigger("reloadGrid",[{page:1}]);
if(saveurl) {$($t).jqGrid("setGridParam",{url:saveurl});}
if($.isFunction(p.afterClear)){p.afterClear();}
};
@@ -651,7 +653,12 @@ $.jgrid.extend({
url: surl,
dataType: "html",
complete: function(res,status) {
- $(self).append(res.responseText);
+ if(soptions.buildSelect != null) {
+ var d = soptions.buildSelect(res);
+ if (d)
+ $(self).append(d);
+ } else
+ $(self).append(res.responseText);
if(soptions.defaultValue) $("select",self).val(soptions.defaultValue);
$("select",self).attr({name:cm.index || cm.name, id: "gs_"+cm.name});
if(soptions.attr) {$("select",self).attr(soptions.attr);}
@@ -672,7 +679,7 @@ $.jgrid.extend({
if(cm.searchoptions && cm.searchoptions.value)
oSv = cm.searchoptions.value;
else if(cm.editoptions && cm.editoptions.value) {
- var oSv = cm.editoptions.value;
+ oSv = cm.editoptions.value;
}
if (oSv) {
var elem = document.createElement("select");
@@ -688,7 +695,6 @@ $.jgrid.extend({
}
} else if(typeof oSv === "object" ) {
for ( var key in oSv) {
- i++;
ov = document.createElement("option");
ov.value = key; ov.innerHTML = oSv[key];
elem.appendChild(ov);
js/grid.custom.js
@@ -303,10 +303,13 @@ jQuery.fn.searchFilter = function(fields, options) {
has_custom_data = true;
var dEvents = this.dataEvents;
var iEvent = this.dataInit;
+ var bs = this.buildSelect;
jQuery.ajax(jQuery.extend({
url : this.dataUrl,
complete: function(data) {
- var $d = jQuery("<div />").append(data.responseText);
+ var $d;
+ if(bs != null) $d =jQuery("<div />").append(bs(data));
+ else $d = jQuery("<div />").append(data.responseText);
$d.find("select").addClass("field" + field_num).hide();
jData.append($d.html());
if (iEvent) initData(".field" + i, iEvent);
js/jquery.searchFilter.js
89eb9e776b03234efd5b4eca88c284ee0a9b6682
tomovtony
tony@trirand.com
http://github.com/andrewwatts/jqGrid/commit/2603866ca86cbbfe52daa0566b9bcaa3e578000f
2603866ca86cbbfe52daa0566b9bcaa3e578000f
2009-11-03T09:01:01-08:00
2009-11-03T09:01:01-08:00
Adding buildSerch function in editoptions and/or serchoptions which is called whitin ajax complete. The purpose is to build own selec in case the server can not return the required content
1073b18412fa9c8f464e1c422967ce8b8a1931b8
tomovtony
tony@trirand.com