Skip to content

Commit f57c239

Browse files
committed
rebuild src/min/map and dist files
1 parent 1d69d20 commit f57c239

21 files changed

+168
-95
lines changed

dist/jquery.jqgrid.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.jqgrid.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery.jqgrid.src.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Dual licensed under the MIT and GPL licenses
99
* http://www.opensource.org/licenses/mit-license.php
1010
* http://www.gnu.org/licenses/gpl-2.0.html
11-
* Date: 2018-09-02
11+
* Date: 2018-09-10
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */
@@ -9420,17 +9420,18 @@
94209420
try { $dlg.focus(); } catch (ignore) { }
94219421
},
94229422
bindEv: function (el, opt) {
9423-
var $t = this;
9423+
var $t = this, p = $t.p;
94249424
if ($.isFunction(opt.dataInit)) {
94259425
opt.dataInit.call($t, el, opt);
94269426
}
94279427
if (opt.dataEvents) {
94289428
$.each(opt.dataEvents, function () {
9429-
if (this.data !== undefined) {
9430-
$(el).on(this.type, typeof this.data === "object" && this.data !== null ? $.extend(true, {}, opt, this.data) : this.data, this.fn);
9431-
} else {
9432-
$(el).on(this.type, opt, this.fn);
9433-
}
9429+
var data = this.data === undefined ?
9430+
$.extend({ gridId: p.id, gridIdSel: p.idSel }, opt) :
9431+
(typeof this.data === "object" && this.data !== null ?
9432+
$.extend(true, { gridId: p.id, gridIdSel: p.idSel }, opt, this.data) :
9433+
this.data);
9434+
$(el).on(this.type, data, this.fn);
94349435
});
94359436
}
94369437
},
@@ -14942,7 +14943,7 @@
1494214943
if (o.refreshstate !== "currentfilter") {
1494314944
p.postData.filters = "";
1494414945
try {
14945-
$("#fbox_" + gridIdEscaped).jqFilter("resetFilter");
14946+
$("#fbox_" + gridIdEscaped.substr(1)).jqFilter("resetFilter");
1494614947
} catch (ignore) { }
1494714948
if ($.isFunction($t.clearToolbar)) { $t.clearToolbar(false); }
1494814949
}

dist/modules/grid.base.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Dual licensed under the MIT and GPL licenses
99
* http://www.opensource.org/licenses/mit-license.php
1010
* http://www.gnu.org/licenses/gpl-2.0.html
11-
* Date: 2018-09-02
11+
* Date: 2018-09-10
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */

dist/modules/grid.common.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -381,17 +381,18 @@
381381
try { $dlg.focus(); } catch (ignore) { }
382382
},
383383
bindEv: function (el, opt) {
384-
var $t = this;
384+
var $t = this, p = $t.p;
385385
if ($.isFunction(opt.dataInit)) {
386386
opt.dataInit.call($t, el, opt);
387387
}
388388
if (opt.dataEvents) {
389389
$.each(opt.dataEvents, function () {
390-
if (this.data !== undefined) {
391-
$(el).on(this.type, typeof this.data === "object" && this.data !== null ? $.extend(true, {}, opt, this.data) : this.data, this.fn);
392-
} else {
393-
$(el).on(this.type, opt, this.fn);
394-
}
390+
var data = this.data === undefined ?
391+
$.extend({ gridId: p.id, gridIdSel: p.idSel }, opt) :
392+
(typeof this.data === "object" && this.data !== null ?
393+
$.extend(true, { gridId: p.id, gridIdSel: p.idSel }, opt, this.data) :
394+
this.data);
395+
$(el).on(this.type, data, this.fn);
395396
});
396397
}
397398
},

dist/modules/grid.formedit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2257,7 +2257,7 @@
22572257
if (o.refreshstate !== "currentfilter") {
22582258
p.postData.filters = "";
22592259
try {
2260-
$("#fbox_" + gridIdEscaped).jqFilter("resetFilter");
2260+
$("#fbox_" + gridIdEscaped.substr(1)).jqFilter("resetFilter");
22612261
} catch (ignore) { }
22622262
if ($.isFunction($t.clearToolbar)) { $t.clearToolbar(false); }
22632263
}

dist/modules/min/grid.base.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modules/min/grid.common.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modules/min/grid.common.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modules/min/grid.formedit.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/modules/min/grid.formedit.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/grid.base.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Dual licensed under the MIT and GPL licenses
99
* http://www.opensource.org/licenses/mit-license.php
1010
* http://www.gnu.org/licenses/gpl-2.0.html
11-
* Date: 2018-09-02
11+
* Date: 2018-09-10
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */

js/jquery.jqgrid.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/jquery.jqgrid.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/jquery.jqgrid.src.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Dual licensed under the MIT and GPL licenses
99
* http://www.opensource.org/licenses/mit-license.php
1010
* http://www.gnu.org/licenses/gpl-2.0.html
11-
* Date: 2018-09-02
11+
* Date: 2018-09-10
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */
@@ -9420,17 +9420,18 @@
94209420
try { $dlg.focus(); } catch (ignore) { }
94219421
},
94229422
bindEv: function (el, opt) {
9423-
var $t = this;
9423+
var $t = this, p = $t.p;
94249424
if ($.isFunction(opt.dataInit)) {
94259425
opt.dataInit.call($t, el, opt);
94269426
}
94279427
if (opt.dataEvents) {
94289428
$.each(opt.dataEvents, function () {
9429-
if (this.data !== undefined) {
9430-
$(el).on(this.type, typeof this.data === "object" && this.data !== null ? $.extend(true, {}, opt, this.data) : this.data, this.fn);
9431-
} else {
9432-
$(el).on(this.type, opt, this.fn);
9433-
}
9429+
var data = this.data === undefined ?
9430+
$.extend({ gridId: p.id, gridIdSel: p.idSel }, opt) :
9431+
(typeof this.data === "object" && this.data !== null ?
9432+
$.extend(true, { gridId: p.id, gridIdSel: p.idSel }, opt, this.data) :
9433+
this.data);
9434+
$(el).on(this.type, data, this.fn);
94349435
});
94359436
}
94369437
},
@@ -14942,7 +14943,7 @@
1494214943
if (o.refreshstate !== "currentfilter") {
1494314944
p.postData.filters = "";
1494414945
try {
14945-
$("#fbox_" + gridIdEscaped).jqFilter("resetFilter");
14946+
$("#fbox_" + gridIdEscaped.substr(1)).jqFilter("resetFilter");
1494614947
} catch (ignore) { }
1494714948
if ($.isFunction($t.clearToolbar)) { $t.clearToolbar(false); }
1494814949
}

js/min/grid.base.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/min/grid.common.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/min/grid.common.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/min/grid.formedit.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/min/grid.formedit.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)