Skip to content

Commit

Permalink
rebuild src/min/map and dist files
Browse files Browse the repository at this point in the history
  • Loading branch information
@OlegKi
OlegKi committed Jan 16, 2019
1 parent a00730c commit cde2c11
Show file tree
Hide file tree
Showing 27 changed files with 683 additions and 1,546 deletions.
6 changes: 3 additions & 3 deletions dist/jquery.jqgrid.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jquery.jqgrid.min.js.map
View file

Large diffs are not rendered by default.

82 changes: 47 additions & 35 deletions dist/jquery.jqgrid.src.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
/**
* @license jqGrid 4.15.6-pre - free jqGrid: https://github.com/free-jqgrid/jqGrid
* Copyright (c) 2008-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
* Date: 2018-10-08
* Date: 2019-01-16
*/
//jsHint options
/*jshint eqnull:true */
Expand Down Expand Up @@ -3912,7 +3912,7 @@
for (i = 0; i < datalen; i++) {
item = p.data[i];
val = getAccessor(item, idname);
if (val === undefined) {
if (val === undefined && item != null) {
val = String(randId()); //String(i + 1);
if (item[idname] === undefined) {
item[idname] = val;
Expand Down Expand Up @@ -6918,31 +6918,35 @@
this.each(function () {
var $t = this, p = $t.p, editingInfo = $.jgrid.detectRowEditing.call($t, rowid), rowInd, ia, nextRow;
rowInd = base.getGridRowById.call($($t), rowid);
if (!rowInd) { return false; }
if (p.subGrid) {
nextRow = $(rowInd).next();
if (nextRow.hasClass("ui-subgrid")) {
nextRow.remove();
}
}
if (editingInfo != null) {
try {
if (editingInfo.mode === "inlineEditing" && base.restoreRow != null) {
base.restoreRow.call($($t), rowid);
} else if (editingInfo.mode === "cellEditing" && base.restoreCell != null) {
base.restoreCell.call($($t), editingInfo.savedRow.id, editingInfo.savedRow.ic);
if (rowInd) {
if (p.subGrid) {
nextRow = $(rowInd).next();
if (nextRow.hasClass("ui-subgrid")) {
nextRow.remove();
}
} catch (ignore) { }
}
if (rowInd.rowIndex === p.iRow) { // delete row with selected/edited cell
// reset cell editing parameters in case of selected cells, but not editing
p.iRow = -1;
p.iCol = -1;
}
if (editingInfo != null) {
try {
if (editingInfo.mode === "inlineEditing" && base.restoreRow != null) {
base.restoreRow.call($($t), rowid);
} else if (editingInfo.mode === "cellEditing" && base.restoreCell != null) {
base.restoreCell.call($($t), editingInfo.savedRow.id, editingInfo.savedRow.ic);
}
} catch (ignore) { }
}
if (rowInd.rowIndex === p.iRow) { // delete row with selected/edited cell
// reset cell editing parameters in case of selected cells, but not editing
p.iRow = -1;
p.iCol = -1;
}
$(rowInd).remove();
p.records--;
p.reccount--;
$t.updatepager(true, false);
}
$(rowInd).remove();
p.records--;
p.reccount--;
$t.updatepager(true, false);
// if rowInd is undefined then we could still need delete
// idata from p.data, p._index, p.selarrrow and so on

success = true;
if (p.multiselect) {
ia = $.inArray(rowid, p.selarrrow);
Expand All @@ -6960,6 +6964,14 @@
$t.removeItemDataFromColumnIndex(id);
p.data.splice(pos, 1);
$t.refreshIndex(); // ??? it could be less expansive
if (!rowInd) {
// fix the pager if item is deleted not on the current page
var rn = parseInt(p.rowNum, 10);
p.records = p.data.length;
p.reccount = Math.min(p.records, rn);
p.lastpage = Math.ceil(p.records / rn);
$t.updatepager(true, false);
}
}
}
$t.rebuildRowIndexes();
Expand Down Expand Up @@ -8491,7 +8503,7 @@
/**
* jqGrid extension for cellediting Grid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -11607,7 +11619,7 @@
/**
* jqFilter jQuery jqGrid filter addon.
* Copyright (c) 2011-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -12746,7 +12758,7 @@
/**
* jqGrid extension for form editing Grid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -16131,7 +16143,7 @@
/**
* jqGrid extension for manipulating Grid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -17779,7 +17791,7 @@
/**
* jqGrid pivot functions
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* The modul is created initially by Tony Tomov and it's full rewritten
* for free jqGrid: https://github.com/free-jqgrid/jqGrid by Oleg Kiriljuk
* Dual licensed under the MIT and GPL licenses:
Expand Down Expand Up @@ -18600,7 +18612,7 @@
/**
* jqGrid extension for SubGrid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -19043,7 +19055,7 @@
/**
* jqGrid extension - Tree Grid
* Copyright (c) 2008-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -19692,7 +19704,7 @@
*
* $Version: 2007.08.19 +r2
* Updated by Oleg Kiriljuk to support touch devices
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
*/
// begin module jqdnr
var namespace = ".jqGrid", mouseDown = "mousedown", mouseMove = "mousemove", mouseUp = "mouseup",
Expand Down Expand Up @@ -19847,7 +19859,7 @@
*
* $Version: 07/06/2008 +r13
* Changed by Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
*/
// begin module jqmodal
var jqmHashLength = 0,
Expand Down
64 changes: 38 additions & 26 deletions dist/modules/grid.base.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
/**
* @license jqGrid 4.15.6-pre - free jqGrid: https://github.com/free-jqgrid/jqGrid
* Copyright (c) 2008-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
* Date: 2018-10-08
* Date: 2019-01-16
*/
//jsHint options
/*jshint eqnull:true */
Expand Down Expand Up @@ -3912,7 +3912,7 @@
for (i = 0; i < datalen; i++) {
item = p.data[i];
val = getAccessor(item, idname);
if (val === undefined) {
if (val === undefined && item != null) {
val = String(randId()); //String(i + 1);
if (item[idname] === undefined) {
item[idname] = val;
Expand Down Expand Up @@ -6918,31 +6918,35 @@
this.each(function () {
var $t = this, p = $t.p, editingInfo = $.jgrid.detectRowEditing.call($t, rowid), rowInd, ia, nextRow;
rowInd = base.getGridRowById.call($($t), rowid);
if (!rowInd) { return false; }
if (p.subGrid) {
nextRow = $(rowInd).next();
if (nextRow.hasClass("ui-subgrid")) {
nextRow.remove();
}
}
if (editingInfo != null) {
try {
if (editingInfo.mode === "inlineEditing" && base.restoreRow != null) {
base.restoreRow.call($($t), rowid);
} else if (editingInfo.mode === "cellEditing" && base.restoreCell != null) {
base.restoreCell.call($($t), editingInfo.savedRow.id, editingInfo.savedRow.ic);
if (rowInd) {
if (p.subGrid) {
nextRow = $(rowInd).next();
if (nextRow.hasClass("ui-subgrid")) {
nextRow.remove();
}
} catch (ignore) { }
}
if (rowInd.rowIndex === p.iRow) { // delete row with selected/edited cell
// reset cell editing parameters in case of selected cells, but not editing
p.iRow = -1;
p.iCol = -1;
}
if (editingInfo != null) {
try {
if (editingInfo.mode === "inlineEditing" && base.restoreRow != null) {
base.restoreRow.call($($t), rowid);
} else if (editingInfo.mode === "cellEditing" && base.restoreCell != null) {
base.restoreCell.call($($t), editingInfo.savedRow.id, editingInfo.savedRow.ic);
}
} catch (ignore) { }
}
if (rowInd.rowIndex === p.iRow) { // delete row with selected/edited cell
// reset cell editing parameters in case of selected cells, but not editing
p.iRow = -1;
p.iCol = -1;
}
$(rowInd).remove();
p.records--;
p.reccount--;
$t.updatepager(true, false);
}
$(rowInd).remove();
p.records--;
p.reccount--;
$t.updatepager(true, false);
// if rowInd is undefined then we could still need delete
// idata from p.data, p._index, p.selarrrow and so on

success = true;
if (p.multiselect) {
ia = $.inArray(rowid, p.selarrrow);
Expand All @@ -6960,6 +6964,14 @@
$t.removeItemDataFromColumnIndex(id);
p.data.splice(pos, 1);
$t.refreshIndex(); // ??? it could be less expansive
if (!rowInd) {
// fix the pager if item is deleted not on the current page
var rn = parseInt(p.rowNum, 10);
p.records = p.data.length;
p.reccount = Math.min(p.records, rn);
p.lastpage = Math.ceil(p.records / rn);
$t.updatepager(true, false);
}
}
}
$t.rebuildRowIndexes();
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.celledit.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqGrid extension for cellediting Grid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.filter.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqFilter jQuery jqGrid filter addon.
* Copyright (c) 2011-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.formedit.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqGrid extension for form editing Grid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.inlinedit.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqGrid extension for manipulating Grid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.pivot.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqGrid pivot functions
* Copyright (c) 2008-2014, Tony Tomov, [email protected], http://trirand.com/blog/
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* The modul is created initially by Tony Tomov and it's full rewritten
* for free jqGrid: https://github.com/free-jqgrid/jqGrid by Oleg Kiriljuk
* Dual licensed under the MIT and GPL licenses:
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.subgrid.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqGrid extension for SubGrid Data
* Copyright (c) 2008-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/grid.treegrid.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* jqGrid extension - Tree Grid
* Copyright (c) 2008-2014, Tony Tomov, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/jqdnr.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* $Version: 2007.08.19 +r2
* Updated by Oleg Kiriljuk to support touch devices
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
*/
/*jslint browser: true, white: true */
/*global jQuery, define, exports, module, require */
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/jqmodal.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* $Version: 07/06/2008 +r13
* Changed by Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
*/
/*jslint browser: true, nomen: true, plusplus: true, white: true */
/*global jQuery, define, exports, module, require */
Expand Down
6 changes: 3 additions & 3 deletions dist/modules/min/grid.base.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/modules/min/grid.base.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/plugins/jquery.createcontexmenufromnavigatorbuttons.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2014-2018, Dr. Oleg Kiriljuk, [email protected]
* @license Copyright (c) 2014-2019, Dr. Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/jquery.jqgrid.showhidecolumnmenu.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* @license Copyright (c) 2014-2018, Oleg Kiriljuk, [email protected]
* @license Copyright (c) 2014-2019, Oleg Kiriljuk, [email protected]
* Dual licensed under the MIT and GPL licenses
* http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl-2.0.html
Expand Down
2 changes: 1 addition & 1 deletion dist/plugins/min/jquery.createcontexmenufromnavigatorbuttons.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/plugins/min/jquery.jqgrid.showhidecolumnmenu.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions js/jquery.jqgrid.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/jquery.jqgrid.min.js.map
View file

Large diffs are not rendered by default.

Loading

0 comments on commit cde2c11

Please sign in to comment.