Permalink
Browse files

Update the build

  • Loading branch information...
tonytomov committed Nov 9, 2017
1 parent ab8b3e4 commit d362621a9b32dec5a836dd7a67dc47f8841b1ea2
Showing with 38 additions and 42 deletions.
  1. +34 −38 js/jquery.jqGrid.js
  2. +2 −2 js/jquery.jqGrid.min.js
  3. +1 −1 js/jquery.jqGrid.min.js.map
  4. +1 −1 js/minified/grid.export.js
View
@@ -1,6 +1,6 @@
/**
*
* @license Guriddo jqGrid JS - v5.2.1 - 2017-11-02
* @license Guriddo jqGrid JS - v5.2.1 - 2017-11-09
* Copyright(c) 2008, Tony Tomov, tony@trirand.com
*
* License: http://guriddo.net/?page_id=103334
@@ -17086,7 +17086,7 @@ $.jgrid.extend({
cmlen = cm.length,
clbl = $t.p.colNames,
i, j=0, row, str = '' , tmp, k,
cap = "", hdr = "", ftr="", lbl="", albl=[], restorevis = [];
cap = "", hdr = "", ftr="", lbl="", albl=[];
function groupToCsv (grdata, p) {
var str="",
grp = $t.p.groupingView,
@@ -17128,7 +17128,7 @@ $.jgrid.extend({
//cm = $t.p.colModel,
vv, grlen = fdata.cnt, k, retarr= new Array(p.collen), j=0;
for(k=foffset; k<colspans;k++) {
if(cm[k].hidden || !cm[k].exportcol) {
if(!cm[k].exportcol) {
continue;
}
var tplfld = "{0}";
@@ -17210,7 +17210,7 @@ $.jgrid.extend({
to = grdata[kk - offset];
k = 0;
for(ik = 0; ik < cm.length; ik++) {
if(!cm[ik].hidden) {
if(cm[ik].exportcol) {
arr[k] = $.jgrid.formatCellCsv(
$.jgrid.formatCell( to[cm[ik].name], ik, to, cm[ik], $t, 'csv' ) , p);
k++;
@@ -17242,22 +17242,19 @@ $.jgrid.extend({
}
// end group function
var def = [], key, restorexcol=[];
var def = [], key;
$.each(cm,function(i,n) {
if(n.exportcol === undefined) {
n.exportcol = true;
}
if((n.name === 'cb' || n.name === 'rn') && !n.hidden) {
restorevis.push(i);
n.hidden = true;
}
if(!n.exportcol) {
if(!n.hidden) {
restorexcol.push(i);
n.hidden = true;
if(n.hidden) {
n.exportcol = false;
} else {
n.exportcol = true;
}
}
if(!n.hidden && n.exportcol) {
if(n.name === 'cb' || n.name === 'rn' || n.name === 'subgrid') {
n.exportcol = false;
}
if(n.exportcol) {
albl.push( $.jgrid.formatCellCsv( clbl[i], p) );
def.push( n.name ); // clbl[i];
}
@@ -17279,7 +17276,7 @@ $.jgrid.extend({
tmp = [];
k =0;
for(i = 0; i < cmlen; i++) {
if(!cm[i].hidden) {
if(cm[i].exportcol) {
tmp[k] = $.jgrid.formatCellCsv( $.jgrid.formatCell( row[cm[i].name], i, row, cm[i], $t, 'csv' ), p );
k++;
}
@@ -17321,28 +17318,19 @@ $.jgrid.extend({
// already formated
var foot = $(".ui-jqgrid-ftable", this.sDiv);
if(foot.length) {
var frows = foot[0].rows[0];
i=0;j=0; tmp=[];
while(i < frows.cells.length){
var fc = frows.cells[i],
coln = $(fc).attr('aria-describedby').slice(-3);
if(!fc.hidden && coln !== '_cb' && coln !== '_rn' ) {
tmp[j] = $.jgrid.formatCellCsv( $(fc).text(), p );
j++;
var frows = $($t).jqGrid('footerData', 'get');
i=0; tmp=[];
while(i < p.collen){
var fc = def[i];
if(frows.hasOwnProperty(fc) ) {
tmp.push( $.jgrid.formatCellCsv( $.jgrid.stripHtml( frows[fc] ), p ) );
}
i++;
}
ftr += tmp.join( p.separator ) + p.newLine;
}
}
ret = cap + hdr + lbl + str + ftr;
for(i=0;i<restorevis.length;i++) {
cm[restorevis[i]].hidden = false;
}
for(i=0;i<restorexcol.length;i++) {
cm[restorexcol[i]].hidden = false;
}
});
if (p.returnAsString) {
return ret;
@@ -17400,9 +17388,13 @@ $.jgrid.extend({
};
for ( j=0, ien=cm.length ; j<ien ; j++ ) {
if(cm[j].exportcol === undefined) {
cm[j].exportcol = true;
if(cm[j].hidden) {
cm[j].exportcol = false;
} else {
cm[j].exportcol = true;
}
}
if(cm[j].hidden || cm[j].name === 'cb' || cm[j].name === 'rn' || !cm[j].exportcol) {
if( cm[j].name === 'cb' || cm[j].name === 'rn' || cm[j].name === 'subgrid' || !cm[j].exportcol) {
continue;
}
data.header[i] = cm[j].name;
@@ -17554,7 +17546,7 @@ $.jgrid.extend({
//cm = $t.p.colModel,
vv, grlen = fdata.cnt, k, retarr = emptyData(data.header);
for(k=foffset; k<colspans;k++) {
if(cm[k].hidden || !cm[k].exportcol) {
if(!cm[k].exportcol) {
continue;
}
var tplfld = "{0}";
@@ -17836,7 +17828,7 @@ $.jgrid.extend({
//cm = $t.p.colModel,
vv, grlen = fdata.cnt, k, retarr = emptyData(def);
for(k=foffset; k<colspans;k++) {
if(cm[k].hidden || !cm[k].exportcol) {
if(!cm[k].exportcol) {
continue;
}
var tplfld = "{0}";
@@ -17948,9 +17940,13 @@ $.jgrid.extend({
var k;
for ( j=0, ien=cm.length ; j<ien ; j++ ) {
if(cm[j].exportcol === undefined ) {
cm[j].exportcol = true;
if(cm[j].hidden) {
cm[j].exportcol = false;
} else {
cm[j].exportcol = true;
}
}
if(cm[j].hidden || cm[j].name === 'cb' || cm[j].name === 'rn' || !cm[j].exportcol) {
if(cm[j].name === 'cb' || cm[j].name === 'rn' || cm[j].name === 'subgrid' || !cm[j].exportcol) {
continue;
}
obj = { text: $t.p.colNames[j], style: 'tableHeader' };
View

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit d362621

Please sign in to comment.