Skip to content

Commit 0d5166c

Browse files
OlegKiOlegKi
committed
update min/map/src and dist files
1 parent afe9ece commit 0d5166c

27 files changed

+170
-30
lines changed

‎dist/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.

‎dist/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.

‎dist/jquery.jqgrid.src.js

Lines changed: 49 additions & 3 deletions
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: 2017-05-13
11+
* Date: 2017-05-23
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */
@@ -6020,7 +6020,6 @@
60206020
// convert to format of editoptions.value or searchoptions.value
60216021
delimiter = delimiter || ";";
60226022
separator = separator || ":";
6023-
v = "";
60246023
for (i = 0, len = uniqueTexts.length; i < len; i++) {
60256024
if (v !== "") {
60266025
v += delimiter || ";";
@@ -6220,6 +6219,21 @@
62206219
}
62216220
return uniqueTexts;
62226221
},
6222+
generateDatalistFromColumnIndex: function (cmName) {
6223+
if (!this[0] || !this[0].grid) { return null; }
6224+
var uniqueTexts = this.jqGrid("getUniqueValueFromColumnIndex", cmName), i, len,
6225+
$dataList = $("<datalist></datalist>");
6226+
6227+
if (uniqueTexts != null && uniqueTexts.length > 0) {
6228+
// convert to format of editoptions.value or searchoptions.value
6229+
for (i = 0, len = uniqueTexts.length; i < len; i++) {
6230+
$dataList.append($("<option></option>").attr("value", uniqueTexts[i]));
6231+
}
6232+
} else {
6233+
return $(); // return empty jQuery object
6234+
}
6235+
return $dataList;
6236+
},
62236237
getGridParam: function (pName) {
62246238
var $t = this[0];
62256239
if (!$t || !$t.grid) { return null; }
@@ -10272,6 +10286,14 @@
1027210286
"' value='" + (soptions.defaultValue !== undefined ? soptions.defaultValue : "") + "'/>");
1027310287

1027410288
$tdInput.append($elem);
10289+
if (cm.createColumnIndex && soptions.generateDatalist) {
10290+
var dataListId = "dl_" + getId(cm.name),
10291+
$datalist = $self.jqGrid("generateDatalistFromColumnIndex", cm.name);
10292+
if ($datalist != null && $datalist.length > 0) {
10293+
$elem.attr("list", dataListId);
10294+
$tdInput.append($datalist.attr("id", dataListId));
10295+
}
10296+
}
1027510297
if (soptions.attr) { $elem.attr(soptions.attr); }
1027610298
bindings.push({ elem: $elem[0], options: soptions });
1027710299
if (o.autosearch === true) {
@@ -11521,6 +11543,14 @@
1152111543
}
1152211544
// data
1152311545
$(".data", trpar).empty().append(elm);
11546+
if (cm.createColumnIndex && searchoptions.generateDatalist) {
11547+
var dataListId = "dl_" + elm.id,
11548+
$datalist = $($t).jqGrid("generateDatalistFromColumnIndex", cm.name);
11549+
if ($datalist != null && $datalist.length > 0) {
11550+
$(elm).attr("list", dataListId);
11551+
$(".data", trpar).append($datalist.attr("id", dataListId));
11552+
}
11553+
}
1152411554
jgrid.bindEv.call($t, elm, searchoptions);
1152511555
$(".input-elm", trpar).on("change", searchoptions, function (e) {
1152611556
var elem = e.target, column = e.data.column;
@@ -11639,6 +11669,14 @@
1163911669
// is created previously
1164011670
//ruleDataInput.setAttribute("type", "text");
1164111671
ruleDataTd.append(ruleDataInput);
11672+
if (cm.createColumnIndex && cm.searchoptions.generateDatalist) {
11673+
var dataListId = "dl_" + ruleDataInput.id,
11674+
$datalist = $($t).jqGrid("generateDatalistFromColumnIndex", cm.name);
11675+
if ($datalist != null && $datalist.length > 0) {
11676+
$(ruleDataInput).attr("list", dataListId);
11677+
ruleDataTd.append($datalist.attr("id", dataListId));
11678+
}
11679+
}
1164211680
jgrid.bindEv.call($t, ruleDataInput, cm.searchoptions);
1164311681
$(ruleDataInput).addClass(getGuiStyles("searchDialog.elem", "input-elm"))
1164411682
.on("change", function () {
@@ -12834,7 +12872,15 @@
1283412872
var $label = $("td:eq(" + (cp - 2) + ")", trdata[0]),
1283512873
$data = $("td:eq(" + (cp - 1) + ")", trdata[0]);
1283612874
$label.html(frmopt.label === undefined ? p.colNames[iCol] : frmopt.label || "&#160;");
12837-
$data[isEmptyString($data.html()) ? "html" : "append"](frmopt.elmprefix).append(elc).append(frmopt.elmsuffix);
12875+
var $dataCell = $data[isEmptyString($data.html()) ? "html" : "append"](frmopt.elmprefix);
12876+
$dataCell.append(elc).append(frmopt.elmsuffix);
12877+
if (elc.tagName.toUpperCase() === "INPUT" && cm.createColumnIndex && opt.generateDatalist) {
12878+
var $datalist = $self.jqGrid("generateDatalistFromColumnIndex", cm.name);
12879+
if ($datalist != null && $datalist.length > 0) {
12880+
$(elc).attr("list", "dl_" + elc.id);
12881+
$dataCell.append($datalist.attr("id", "dl_" + elc.id));
12882+
}
12883+
}
1283812884
if (disabled) {
1283912885
$label.addClass(disabledClass);
1284012886
$data.addClass(disabledClass);

‎dist/modules/grid.base.js

Lines changed: 16 additions & 2 deletions
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: 2017-05-13
11+
* Date: 2017-05-23
1212
*/
1313
//jsHint options
1414
/*jshint eqnull:true */
@@ -6020,7 +6020,6 @@
60206020
// convert to format of editoptions.value or searchoptions.value
60216021
delimiter = delimiter || ";";
60226022
separator = separator || ":";
6023-
v = "";
60246023
for (i = 0, len = uniqueTexts.length; i < len; i++) {
60256024
if (v !== "") {
60266025
v += delimiter || ";";
@@ -6220,6 +6219,21 @@
62206219
}
62216220
return uniqueTexts;
62226221
},
6222+
generateDatalistFromColumnIndex: function (cmName) {
6223+
if (!this[0] || !this[0].grid) { return null; }
6224+
var uniqueTexts = this.jqGrid("getUniqueValueFromColumnIndex", cmName), i, len,
6225+
$dataList = $("<datalist></datalist>");
6226+
6227+
if (uniqueTexts != null && uniqueTexts.length > 0) {
6228+
// convert to format of editoptions.value or searchoptions.value
6229+
for (i = 0, len = uniqueTexts.length; i < len; i++) {
6230+
$dataList.append($("<option></option>").attr("value", uniqueTexts[i]));
6231+
}
6232+
} else {
6233+
return $(); // return empty jQuery object
6234+
}
6235+
return $dataList;
6236+
},
62236237
getGridParam: function (pName) {
62246238
var $t = this[0];
62256239
if (!$t || !$t.grid) { return null; }

‎dist/modules/grid.custom.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,14 @@
987987
"' value='" + (soptions.defaultValue !== undefined ? soptions.defaultValue : "") + "'/>");
988988

989989
$tdInput.append($elem);
990+
if (cm.createColumnIndex && soptions.generateDatalist) {
991+
var dataListId = "dl_" + getId(cm.name),
992+
$datalist = $self.jqGrid("generateDatalistFromColumnIndex", cm.name);
993+
if ($datalist != null && $datalist.length > 0) {
994+
$elem.attr("list", dataListId);
995+
$tdInput.append($datalist.attr("id", dataListId));
996+
}
997+
}
990998
if (soptions.attr) { $elem.attr(soptions.attr); }
991999
bindings.push({ elem: $elem[0], options: soptions });
9921000
if (o.autosearch === true) {

‎dist/modules/grid.filter.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,14 @@
486486
}
487487
// data
488488
$(".data", trpar).empty().append(elm);
489+
if (cm.createColumnIndex && searchoptions.generateDatalist) {
490+
var dataListId = "dl_" + elm.id,
491+
$datalist = $($t).jqGrid("generateDatalistFromColumnIndex", cm.name);
492+
if ($datalist != null && $datalist.length > 0) {
493+
$(elm).attr("list", dataListId);
494+
$(".data", trpar).append($datalist.attr("id", dataListId));
495+
}
496+
}
489497
jgrid.bindEv.call($t, elm, searchoptions);
490498
$(".input-elm", trpar).on("change", searchoptions, function (e) {
491499
var elem = e.target, column = e.data.column;
@@ -604,6 +612,14 @@
604612
// is created previously
605613
//ruleDataInput.setAttribute("type", "text");
606614
ruleDataTd.append(ruleDataInput);
615+
if (cm.createColumnIndex && cm.searchoptions.generateDatalist) {
616+
var dataListId = "dl_" + ruleDataInput.id,
617+
$datalist = $($t).jqGrid("generateDatalistFromColumnIndex", cm.name);
618+
if ($datalist != null && $datalist.length > 0) {
619+
$(ruleDataInput).attr("list", dataListId);
620+
ruleDataTd.append($datalist.attr("id", dataListId));
621+
}
622+
}
607623
jgrid.bindEv.call($t, ruleDataInput, cm.searchoptions);
608624
$(ruleDataInput).addClass(getGuiStyles("searchDialog.elem", "input-elm"))
609625
.on("change", function () {

‎dist/modules/grid.formedit.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,15 @@
690690
var $label = $("td:eq(" + (cp - 2) + ")", trdata[0]),
691691
$data = $("td:eq(" + (cp - 1) + ")", trdata[0]);
692692
$label.html(frmopt.label === undefined ? p.colNames[iCol] : frmopt.label || "&#160;");
693-
$data[isEmptyString($data.html()) ? "html" : "append"](frmopt.elmprefix).append(elc).append(frmopt.elmsuffix);
693+
var $dataCell = $data[isEmptyString($data.html()) ? "html" : "append"](frmopt.elmprefix);
694+
$dataCell.append(elc).append(frmopt.elmsuffix);
695+
if (elc.tagName.toUpperCase() === "INPUT" && cm.createColumnIndex && opt.generateDatalist) {
696+
var $datalist = $self.jqGrid("generateDatalistFromColumnIndex", cm.name);
697+
if ($datalist != null && $datalist.length > 0) {
698+
$(elc).attr("list", "dl_" + elc.id);
699+
$dataCell.append($datalist.attr("id", "dl_" + elc.id));
700+
}
701+
}
694702
if (disabled) {
695703
$label.addClass(disabledClass);
696704
$data.addClass(disabledClass);

‎dist/modules/min/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.

‎dist/modules/min/grid.base.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.

‎dist/modules/min/grid.custom.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.

‎dist/modules/min/grid.custom.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.

0 commit comments

Comments
 (0)