diff --git a/README.md b/README.md
index 9e32b24d..f0fd8ab7 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,6 @@
[](https://www.npmjs.com/package/jQuery-QueryBuilder)
[](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder)
[](https://github.com/mistic100/jQuery-QueryBuilder/actions)
-[](https://david-dm.org/mistic100/jQuery-QueryBuilder)
[](https://gitlocalize.com/repo/5259/whole_project?utm_source=badge)
jQuery plugin offering an simple interface to create complex queries.
@@ -34,18 +33,14 @@ $ npm install jQuery-QueryBuilder
jQuery-QueryBuilder is available on [jsDelivr](https://www.jsdelivr.com/package/npm/jQuery-QueryBuilder).
### Dependencies
* [jQuery 3](https://jquery.com)
- * [Bootstrap 3](https://getbootstrap.com/docs/3.3) (CSS only)
+ * [Bootstrap 5](https://getbootstrap.com/docs/5.3/) CSS and bundle.js which includes `Popper` for tooltips and popovers
+ * [Bootstrap Icons](https://icons.getbootstrap.com/)
* [jQuery.extendext](https://github.com/mistic100/jQuery.extendext)
- * [doT.js](https://olado.github.io/doT)
* [MomentJS](https://momentjs.com) (optional, for Date/Time validation)
* [SQL Parser](https://github.com/mistic100/sql-parser) (optional, for SQL methods)
* Other Bootstrap/jQuery plugins used by plugins
-($.extendext and doT.js are directly included in the [standalone](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/dist/js/query-builder.standalone.js) file)
-
-### Browser support
- * Internet Explorer >= 11
- * All other recent browsers
+($.extendext is directly included in the [standalone](https://github.com/mistic100/jQuery-QueryBuilder/blob/master/dist/js/query-builder.standalone.js) file)
diff --git a/build/jsdoc.md b/build/jsdoc.md
index 029fecb1..e329af92 100644
--- a/build/jsdoc.md
+++ b/build/jsdoc.md
@@ -1,4 +1,4 @@
-# [Main documentation](..)
+# [Main documentation](..)
# Entry point: [$.fn.QueryBuilder](external-_jQuery.fn_.html)
diff --git a/dist/css/query-builder.dark.css b/dist/css/query-builder.dark.css
index c5a5960f..90b5fbaa 100644
--- a/dist/css/query-builder.dark.css
+++ b/dist/css/query-builder.dark.css
@@ -1,11 +1,11 @@
/*!
- * jQuery QueryBuilder 2.7.0
- * Copyright 2014-2023 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 3.0.0
+ * Copyright 2014-2024 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (https://opensource.org/licenses/MIT)
*/
/*!
- * jQuery QueryBuilder 2.7.0
- * Copyright 2014-2023 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 3.0.0
+ * Copyright 2014-2024 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (https://opensource.org/licenses/MIT)
*/
.query-builder .rule-placeholder, .query-builder .rule-container, .query-builder .rules-group-container {
@@ -65,11 +65,6 @@
.query-builder .rule-value-container label.block {
display: block;
}
-.query-builder .rule-value-container select,
-.query-builder .rule-value-container input[type=text],
-.query-builder .rule-value-container input[type=number] {
- padding: 1px;
-}
.query-builder .error-container {
display: none;
cursor: help;
@@ -110,14 +105,12 @@
display: none;
}
-.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked + label::after {
- font-family: "Glyphicons Halflings";
- content: "\e013";
-}
-.query-builder.bt-checkbox-glyphicons .checkbox label::after {
- padding-left: 4px;
- padding-top: 2px;
- font-size: 9px;
+.query-builder.bt-checkbox-bootstrap-icons .checkbox input[type=checkbox] + label::before {
+ outline: 0;
+}
+.query-builder.bt-checkbox-bootstrap-icons .checkbox input[type=checkbox]:checked + label::after {
+ font-family: "bootstrap-icons";
+ content: "\f633";
}
.query-builder .error-container + .tooltip .tooltip-inner {
diff --git a/dist/css/query-builder.default.css b/dist/css/query-builder.default.css
index c8a03cfb..b5edf68e 100644
--- a/dist/css/query-builder.default.css
+++ b/dist/css/query-builder.default.css
@@ -1,6 +1,6 @@
/*!
- * jQuery QueryBuilder 2.7.0
- * Copyright 2014-2023 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 3.0.0
+ * Copyright 2014-2024 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (https://opensource.org/licenses/MIT)
*/
.query-builder .rule-placeholder, .query-builder .rule-container, .query-builder .rules-group-container {
@@ -60,11 +60,6 @@
.query-builder .rule-value-container label.block {
display: block;
}
-.query-builder .rule-value-container select,
-.query-builder .rule-value-container input[type=text],
-.query-builder .rule-value-container input[type=number] {
- padding: 1px;
-}
.query-builder .error-container {
display: none;
cursor: help;
@@ -105,14 +100,12 @@
display: none;
}
-.query-builder.bt-checkbox-glyphicons .checkbox input[type=checkbox]:checked + label::after {
- font-family: "Glyphicons Halflings";
- content: "\e013";
-}
-.query-builder.bt-checkbox-glyphicons .checkbox label::after {
- padding-left: 4px;
- padding-top: 2px;
- font-size: 9px;
+.query-builder.bt-checkbox-bootstrap-icons .checkbox input[type=checkbox] + label::before {
+ outline: 0;
+}
+.query-builder.bt-checkbox-bootstrap-icons .checkbox input[type=checkbox]:checked + label::after {
+ font-family: "bootstrap-icons";
+ content: "\f633";
}
.query-builder .error-container + .tooltip .tooltip-inner {
diff --git a/dist/i18n/query-builder.ar.js b/dist/i18n/query-builder.ar.js
index f4518b39..edb2917e 100644
--- a/dist/i18n/query-builder.ar.js
+++ b/dist/i18n/query-builder.ar.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Arabic (ar)
* Author: Mohamed YOUNES, https://github.com/MedYOUNES
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.az.js b/dist/i18n/query-builder.az.js
index 2d3b1bb4..3820f42e 100644
--- a/dist/i18n/query-builder.az.js
+++ b/dist/i18n/query-builder.az.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Azerbaijan (az)
* Author: Megaplan, mborisv
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.bg.js b/dist/i18n/query-builder.bg.js
index 1e085b71..3fa9dc74 100644
--- a/dist/i18n/query-builder.bg.js
+++ b/dist/i18n/query-builder.bg.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Bulgarian (bg)
* Author: Valentin Hristov
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.cs.js b/dist/i18n/query-builder.cs.js
index 9bbc9e81..551bee28 100644
--- a/dist/i18n/query-builder.cs.js
+++ b/dist/i18n/query-builder.cs.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Čeština (cs)
* Author: Megaplan, mborisv
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.da.js b/dist/i18n/query-builder.da.js
index bdb1e05c..ff6d3f77 100644
--- a/dist/i18n/query-builder.da.js
+++ b/dist/i18n/query-builder.da.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Danish (da)
* Author: Jna Borup Coyle, github@coyle.dk
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.de.js b/dist/i18n/query-builder.de.js
index bab1070e..d92c6679 100644
--- a/dist/i18n/query-builder.de.js
+++ b/dist/i18n/query-builder.de.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: German (de)
* Author: "raimu"
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.el.js b/dist/i18n/query-builder.el.js
index c73b4c92..701d2045 100644
--- a/dist/i18n/query-builder.el.js
+++ b/dist/i18n/query-builder.el.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Greek (el)
* Author: Stelios Patsatzis, https://www.linkedin.com/in/stelios-patsatzis-89841561
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.en.js b/dist/i18n/query-builder.en.js
index d2831bb5..a6ce0f66 100644
--- a/dist/i18n/query-builder.en.js
+++ b/dist/i18n/query-builder.en.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: English (en)
* Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.eo.js b/dist/i18n/query-builder.eo.js
index fa65b732..6e66521d 100644
--- a/dist/i18n/query-builder.eo.js
+++ b/dist/i18n/query-builder.eo.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Esperanto (eo)
* Author: Robin van der Vliet, https://robinvandervliet.com/
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.es.js b/dist/i18n/query-builder.es.js
index 021644cd..ea94a3fd 100644
--- a/dist/i18n/query-builder.es.js
+++ b/dist/i18n/query-builder.es.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Spanish (es)
* Author: "pyarza", "kddlb"
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.fa-IR.js b/dist/i18n/query-builder.fa-IR.js
index c4fd7153..011758fd 100644
--- a/dist/i18n/query-builder.fa-IR.js
+++ b/dist/i18n/query-builder.fa-IR.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Farsi (fa-ir)
* Author: Behzad Sedighzade, behzad.sedighzade@gmail.com
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.fr.js b/dist/i18n/query-builder.fr.js
index 5baa88db..39dc7303 100644
--- a/dist/i18n/query-builder.fr.js
+++ b/dist/i18n/query-builder.fr.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: French (fr)
* Author: Damien "Mistic" Sorel, http://www.strangeplanet.fr
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.he.js b/dist/i18n/query-builder.he.js
index 2cf9d0da..2e453775 100644
--- a/dist/i18n/query-builder.he.js
+++ b/dist/i18n/query-builder.he.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Hebrew (he)
* Author: Kfir Stri https://github.com/kfirstri
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.hu.js b/dist/i18n/query-builder.hu.js
index daf91eeb..323a9adc 100644
--- a/dist/i18n/query-builder.hu.js
+++ b/dist/i18n/query-builder.hu.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Hungarian - Magyar (hu)
* Author: Szabó Attila "Tailor993", https://www.tailor993.hu
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.it.js b/dist/i18n/query-builder.it.js
index 55cee3b3..c4565e96 100644
--- a/dist/i18n/query-builder.it.js
+++ b/dist/i18n/query-builder.it.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Italian (it)
* Author: davegraziosi, Giuseppe Lodi Rizzini
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.lt.js b/dist/i18n/query-builder.lt.js
index ea879ef7..5d0324ab 100644
--- a/dist/i18n/query-builder.lt.js
+++ b/dist/i18n/query-builder.lt.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Lithuanian (lt)
* Author: Dalius Guzauskas (aka Tichij), https://lt.linkedin.com/in/daliusg
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.nl.js b/dist/i18n/query-builder.nl.js
index 0ea33139..8e88ac56 100644
--- a/dist/i18n/query-builder.nl.js
+++ b/dist/i18n/query-builder.nl.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Dutch (nl)
* Author: "Roywcm"
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.no.js b/dist/i18n/query-builder.no.js
index 56bba7ee..1ec2d013 100644
--- a/dist/i18n/query-builder.no.js
+++ b/dist/i18n/query-builder.no.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Norwegian (no)
* Author: Jna Borup Coyle, github@coyle.dk
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.pl.js b/dist/i18n/query-builder.pl.js
index a63591f4..c89d0316 100644
--- a/dist/i18n/query-builder.pl.js
+++ b/dist/i18n/query-builder.pl.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Polish (pl)
* Author: Artur Smolarek
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.pt-BR.js b/dist/i18n/query-builder.pt-BR.js
index 4dd9a042..a9b4fe59 100644
--- a/dist/i18n/query-builder.pt-BR.js
+++ b/dist/i18n/query-builder.pt-BR.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Brazilian Portuguese (pr-BR)
* Author: Leandro Gehlen, leandrogehlen@gmail.com; Marcos Ferretti, marcosvferretti@gmail.com
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.pt-PT.js b/dist/i18n/query-builder.pt-PT.js
index 67bd1c1b..1e0aa77f 100644
--- a/dist/i18n/query-builder.pt-PT.js
+++ b/dist/i18n/query-builder.pt-PT.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Portuguese (pt-PT)
* Author: Miguel Guerreiro, migas.csi@gmail.com
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.ro.js b/dist/i18n/query-builder.ro.js
index bd154998..a1ba7eda 100644
--- a/dist/i18n/query-builder.ro.js
+++ b/dist/i18n/query-builder.ro.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Romanian (ro)
* Author: ArianServ, totpero
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.ru.js b/dist/i18n/query-builder.ru.js
index 562c93b9..03cc3b7c 100644
--- a/dist/i18n/query-builder.ru.js
+++ b/dist/i18n/query-builder.ru.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Russian (ru)
* Author:
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.sk.js b/dist/i18n/query-builder.sk.js
index 16ccc00c..d8ca2623 100644
--- a/dist/i18n/query-builder.sk.js
+++ b/dist/i18n/query-builder.sk.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Slovensky (sk)
* Author: k2s
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.sq.js b/dist/i18n/query-builder.sq.js
index b811680c..f991b12a 100644
--- a/dist/i18n/query-builder.sq.js
+++ b/dist/i18n/query-builder.sq.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Albanian (sq)
* Author: Tomor Pupovci
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.sv.js b/dist/i18n/query-builder.sv.js
index ae28b6ab..715cebb5 100644
--- a/dist/i18n/query-builder.sv.js
+++ b/dist/i18n/query-builder.sv.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Svenska (sv)
* Author: hekin1
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.sw.js b/dist/i18n/query-builder.sw.js
index c3e087ea..8829fc60 100644
--- a/dist/i18n/query-builder.sw.js
+++ b/dist/i18n/query-builder.sw.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Swahili (sw)
* Author: Timothy Anyona
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.tr.js b/dist/i18n/query-builder.tr.js
index 90202cb2..7751e423 100644
--- a/dist/i18n/query-builder.tr.js
+++ b/dist/i18n/query-builder.tr.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Turkish (tr)
* Author: Aykut Alpgiray Ateş
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.ua.js b/dist/i18n/query-builder.ua.js
index 56eb677c..1238b26e 100644
--- a/dist/i18n/query-builder.ua.js
+++ b/dist/i18n/query-builder.ua.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Ukrainian (ua)
* Author: Megaplan, mborisv
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/i18n/query-builder.zh-CN.js b/dist/i18n/query-builder.zh-CN.js
index cdc05bda..d908f33a 100644
--- a/dist/i18n/query-builder.zh-CN.js
+++ b/dist/i18n/query-builder.zh-CN.js
@@ -1,5 +1,5 @@
/*!
- * jQuery QueryBuilder 2.7.0
+ * jQuery QueryBuilder 3.0.0
* Locale: Simplified Chinese (zh_CN)
* Author: shadowwind, shatteredwindgo@gmail.com
* Licensed under MIT (https://opensource.org/licenses/MIT)
diff --git a/dist/js/query-builder.js b/dist/js/query-builder.js
index 97f77570..b5b30837 100644
--- a/dist/js/query-builder.js
+++ b/dist/js/query-builder.js
@@ -1,6 +1,6 @@
/*!
- * jQuery QueryBuilder 2.7.0
- * Copyright 2014-2023 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
+ * jQuery QueryBuilder 3.0.0
+ * Copyright 2014-2024 Damien "Mistic" Sorel (http://www.strangeplanet.fr)
* Licensed under MIT (https://opensource.org/licenses/MIT)
*/
@@ -153,7 +153,7 @@ var QueryBuilder = function($el, options) {
this.status.id = this.$el.attr('id');
// INIT
- this.$el.addClass('query-builder form-inline');
+ this.$el.addClass('query-builder');
this.filters = this.checkFilters(this.filters);
this.operators = this.checkOperators(this.operators);
@@ -431,11 +431,11 @@ QueryBuilder.DEFAULTS = {
],
icons: {
- add_group: 'glyphicon glyphicon-plus-sign',
- add_rule: 'glyphicon glyphicon-plus',
- remove_group: 'glyphicon glyphicon-remove',
- remove_rule: 'glyphicon glyphicon-remove',
- error: 'glyphicon glyphicon-warning-sign'
+ add_group: 'bi-plus-circle-fill',
+ add_rule: 'bi-plus-lg',
+ remove_group: 'bi-x-lg',
+ remove_rule: 'bi-x-lg',
+ error: 'bi-exclamation-triangle'
}
};
@@ -2678,24 +2678,24 @@ QueryBuilder.templates.group = ({ group_id, level, conditions, icons, settings,
return `