make the choice between p.tblwidth and p.width in columnChooser more …

…dynamic
free-jqgrid · Apr 15, 2015 · 6fb09c6 · 6fb09c6
1 parent 1186914
commit 6fb09c6
Show file tree

Hide file tree

Showing 4 changed files with 356 additions and 351 deletions.
diff --git a/js/grid.jqueryui.js b/js/grid.jqueryui.js
@@ -239,7 +239,9 @@
 					if (opts.done) {
 						opts.done.call($self, perm);
 					}
-					$self.jqGrid("setGridWidth", p.width, p.shrinkToFit);
+					$self.jqGrid("setGridWidth",
+						!p.autowidth && (p.widthOrg === undefined || p.widthOrg === "auto" || p.widthOrg === "100%") ? p.tblwidth : p.width,
+						p.shrinkToFit);
 				},
 				/* Function to cleanup the dialog, and select. Also calls the
 				   done function with no permutation (to indicate that the