Skip to content

Commit a00419f

Browse files
author
Tony Tomov
committed
Fix sizingString Function to accept options from formatter.
1 parent 65fd41e commit a00419f

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

‎js/grid.base.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2579,9 +2579,9 @@ $.fn.jqGrid = function( pin ) {
25792579
},
25802580
formatter = function (rowId, cellval , colpos, rwdat, _act){
25812581
var cm = ts.p.colModel[colpos],v;
2582+
rowId = String(ts.p.idPrefix) !== "" ? $.jgrid.stripPref(ts.p.idPrefix, rowId) : rowId;
2583+
var opts= {rowId: rowId, colModel:cm, gid:ts.p.id, pos:colpos, styleUI: ts.p.styleUI };
25822584
if(cm.formatter !== undefined) {
2583-
rowId = String(ts.p.idPrefix) !== "" ? $.jgrid.stripPref(ts.p.idPrefix, rowId) : rowId;
2584-
var opts= {rowId: rowId, colModel:cm, gid:ts.p.id, pos:colpos, styleUI: ts.p.styleUI };
25852585
if($.jgrid.isFunction( cm.formatter ) ) {
25862586
v = cm.formatter.call(ts,cellval,opts,rwdat,_act);
25872587
} else if($.fmatter){

‎js/jquery.jqGrid.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2574,9 +2574,9 @@ $.fn.jqGrid = function( pin ) {
25742574
},
25752575
formatter = function (rowId, cellval , colpos, rwdat, _act){
25762576
var cm = ts.p.colModel[colpos],v;
2577+
rowId = String(ts.p.idPrefix) !== "" ? $.jgrid.stripPref(ts.p.idPrefix, rowId) : rowId;
2578+
var opts= {rowId: rowId, colModel:cm, gid:ts.p.id, pos:colpos, styleUI: ts.p.styleUI };
25772579
if(cm.formatter !== undefined) {
2578-
rowId = String(ts.p.idPrefix) !== "" ? $.jgrid.stripPref(ts.p.idPrefix, rowId) : rowId;
2579-
var opts= {rowId: rowId, colModel:cm, gid:ts.p.id, pos:colpos, styleUI: ts.p.styleUI };
25802580
if($.jgrid.isFunction( cm.formatter ) ) {
25812581
v = cm.formatter.call(ts,cellval,opts,rwdat,_act);
25822582
} else if($.fmatter){

‎js/jquery.jqGrid.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/jquery.jqGrid.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/minified/grid.base.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)