Output
- + + - + @@ -121,7 +122,7 @@Output
+ diff --git a/src/plugins/bt-checkbox/plugin.js b/src/plugins/bt-checkbox/plugin.js index 7a7311c2..7f811bf9 100644 --- a/src/plugins/bt-checkbox/plugin.js +++ b/src/plugins/bt-checkbox/plugin.js @@ -31,11 +31,7 @@ QueryBuilder.define('bt-checkbox', function(options) { var color = filter.colors[key] || filter.colors._def_ || options.color; var id = name + '_' + (i++); - h.value+= '\ -
-
+
@@ -38,7 +38,7 @@ QueryBuilder.templates.rule = ({ rule_id, icons, settings, translate, builder })
return `
-
+
diff --git a/tests/common.js b/tests/common.js
index c8a5919d..c4473ed7 100644
--- a/tests/common.js
+++ b/tests/common.js
@@ -15,7 +15,7 @@ QUnit.begin(function() {
*/
QUnit.begin(function(){
$('#qunit-header').append(
- '
' +
+ '
' +
'' +
'
' +
'' +
diff --git a/tests/plugins-gui.module.js b/tests/plugins-gui.module.js
index 00a131a1..b7f91fe4 100644
--- a/tests/plugins-gui.module.js
+++ b/tests/plugins-gui.module.js
@@ -131,9 +131,9 @@ $(function(){
$b.queryBuilder('validate');
assert.equal(
- $('#builder_group_0 .error-container').eq(0).data('toggle'),
+ $('#builder_group_0 .error-container').eq(0).data('bs-toggle'),
'tooltip',
- 'Should have added data-toggle="tooltip" in the template'
+ 'Should have added data-bs-toggle="tooltip" in the template'
);
assert.equal(
@@ -201,7 +201,7 @@ $(function(){
});
assert.ok(
- $('#builder_rule_0 button.filter-description').data('toggle') == 'popover',
+ $('#builder_rule_0 button.filter-description').data('bs-toggle') == 'popover',
'Rule should contain a new button enabled with Popover'
);
@@ -216,7 +216,7 @@ $(function(){
});
assert.ok(
- $('#builder_rule_0 button.filter-description').data('toggle') == 'bootbox',
+ $('#builder_rule_0 button.filter-description').data('bs-toggle') == 'bootbox',
'Rule should contain a new button enabled with Bootbox'
);
});
From 60e5e818b3a6dda258f573ac679e4ea0ef4a5e3b Mon Sep 17 00:00:00 2001
From: Stephen Morton
Date: Sun, 21 May 2023 12:33:35 -0400
Subject: [PATCH 03/34] Bootstrap 5 - Popover library conversion
---
examples/index.html | 4 +++-
src/plugins/bt-tooltip-errors/plugin.js | 9 ++++-----
src/plugins/filter-description/plugin.js | 12 +++++-------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/examples/index.html b/examples/index.html
index 00230b0d..fc9f31e5 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -123,7 +123,9 @@
Date: Tue, 9 Jan 2024 06:37:28 -0500
Subject: [PATCH 06/34] fix(plugins): bt-checkbox BS5 markup
---
src/plugins/bt-checkbox/plugin.js | 8 +-------
src/plugins/bt-checkbox/plugin.scss | 12 ------------
2 files changed, 1 insertion(+), 19 deletions(-)
delete mode 100644 src/plugins/bt-checkbox/plugin.scss
diff --git a/src/plugins/bt-checkbox/plugin.js b/src/plugins/bt-checkbox/plugin.js
index 7f811bf9..9a5b31bb 100644
--- a/src/plugins/bt-checkbox/plugin.js
+++ b/src/plugins/bt-checkbox/plugin.js
@@ -3,14 +3,9 @@
* @memberof module:plugins
* @description Applies Awesome Bootstrap Checkbox for checkbox and radio inputs.
* @param {object} [options]
- * @param {string} [options.font='glyphicons']
* @param {string} [options.color='default']
*/
QueryBuilder.define('bt-checkbox', function(options) {
- if (options.font == 'glyphicons') {
- this.$el.addClass('bt-checkbox-glyphicons');
- }
-
this.on('getRuleInput.filter', function(h, rule, name) {
var filter = rule.filter;
@@ -31,11 +26,10 @@ QueryBuilder.define('bt-checkbox', function(options) {
var color = filter.colors[key] || filter.colors._def_ || options.color;
var id = name + '_' + (i++);
- h.value += ` `;
+ h.value += ` `;
});
}
});
}, {
- font: 'glyphicons',
color: 'default'
});
diff --git a/src/plugins/bt-checkbox/plugin.scss b/src/plugins/bt-checkbox/plugin.scss
deleted file mode 100644
index 324f610f..00000000
--- a/src/plugins/bt-checkbox/plugin.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-.query-builder.bt-checkbox-glyphicons {
- .checkbox input[type='checkbox']:checked + label::after {
- font-family: 'Glyphicons Halflings';
- content: '\e013';
- }
-
- .checkbox label::after {
- padding-left: 4px;
- padding-top: 2px;
- font-size: 9px;
- }
-}
From 4dd8672ee4ba06748de3ae0acc24d9a735f3200f Mon Sep 17 00:00:00 2001
From: David Ethell
Date: Fri, 12 Jan 2024 06:12:47 -0500
Subject: [PATCH 07/34] fix(example): remove bt-selectpicker plugin use
---
examples/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/examples/index.html b/examples/index.html
index 939d7168..fde4559c 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -112,7 +112,7 @@
Date: Wed, 17 Jan 2024 11:19:37 +0000
Subject: [PATCH 08/34] Fix bt-checkbox
---
build/jsdoc.md | 2 +-
src/plugins/bt-checkbox/plugin.js | 6 ++++++
src/plugins/bt-checkbox/plugin.scss | 6 ++++++
3 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 src/plugins/bt-checkbox/plugin.scss
diff --git a/build/jsdoc.md b/build/jsdoc.md
index e329af92..04d4a275 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/src/plugins/bt-checkbox/plugin.js b/src/plugins/bt-checkbox/plugin.js
index 9a5b31bb..26b0998f 100644
--- a/src/plugins/bt-checkbox/plugin.js
+++ b/src/plugins/bt-checkbox/plugin.js
@@ -3,9 +3,14 @@
* @memberof module:plugins
* @description Applies Awesome Bootstrap Checkbox for checkbox and radio inputs.
* @param {object} [options]
+ * @param {string} [options.font='bootstrap-icons']
* @param {string} [options.color='default']
*/
QueryBuilder.define('bt-checkbox', function(options) {
+ if (options.font === 'bootstrap-icons') {
+ this.$el.addClass('bt-checkbox-bootstrap-icons');
+ }
+
this.on('getRuleInput.filter', function(h, rule, name) {
var filter = rule.filter;
@@ -31,5 +36,6 @@ QueryBuilder.define('bt-checkbox', function(options) {
}
});
}, {
+ font: 'bootstrap-icons',
color: 'default'
});
diff --git a/src/plugins/bt-checkbox/plugin.scss b/src/plugins/bt-checkbox/plugin.scss
new file mode 100644
index 00000000..55bea28b
--- /dev/null
+++ b/src/plugins/bt-checkbox/plugin.scss
@@ -0,0 +1,6 @@
+.query-builder.bt-checkbox-bootstrap-icons {
+ .checkbox input[type='checkbox']:checked + label::after {
+ font-family: 'bootstrap-icons';
+ content: '\F633'; // https://icons.getbootstrap.com/icons/check-lg/
+ }
+}
From 61669d6acf02c15835f4df30871aa9341c27c871 Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:20:49 +0000
Subject: [PATCH 09/34] Fix checked squares
---
src/plugins/not-group/plugin.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/not-group/plugin.js b/src/plugins/not-group/plugin.js
index 9a2b5262..b148b1df 100644
--- a/src/plugins/not-group/plugin.js
+++ b/src/plugins/not-group/plugin.js
@@ -3,7 +3,7 @@
* @memberof module:plugins
* @description Adds a "Not" checkbox in front of group conditions.
* @param {object} [options]
- * @param {string} [options.icon_checked='bi-square2']
+ * @param {string} [options.icon_checked='bi-check2-square']
* @param {string} [options.icon_unchecked='bi-square']
*/
QueryBuilder.define('not-group', function(options) {
@@ -113,7 +113,7 @@ QueryBuilder.define('not-group', function(options) {
});
}, {
icon_unchecked: 'bi-square',
- icon_checked: 'bi-square2',
+ icon_checked: 'bi-check2-square',
disable_template: false
});
From ab1ef49d565e1bd7c59fe85d5f17b74a2050aa71 Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:23:37 +0000
Subject: [PATCH 10/34] Latest icons version
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index ae218070..73393862 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
"dependencies": {
"bootstrap": "^5.3.0",
"@popperjs/core": "^2.11.8",
- "bootstrap-icons": "^1.10.5",
+ "bootstrap-icons": "^1.11.3",
"jquery": "^3.5.1",
"jquery-extendext": "^1.0.0",
"moment": "^2.29.1",
From aa70bc8b4b3ea52bd03d29cf1dfbc1e1de3c2f9e Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:23:56 +0000
Subject: [PATCH 11/34] better icons
---
src/defaults.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/defaults.js b/src/defaults.js
index 293cd536..b63b1251 100644
--- a/src/defaults.js
+++ b/src/defaults.js
@@ -188,9 +188,9 @@ QueryBuilder.DEFAULTS = {
icons: {
add_group: 'bi-plus-circle-fill',
- add_rule: 'bi-plus',
- remove_group: 'bi-x',
- remove_rule: 'bi-x',
+ add_rule: 'bi-plus-lg',
+ remove_group: 'bi-x-lg',
+ remove_rule: 'bi-x-lg',
error: 'bi-exclamation-triangle'
}
};
From 25153790df5168d9d7343eb5becca10c8555f092 Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:24:28 +0000
Subject: [PATCH 12/34] Use local package instead of cdn for icons
---
examples/index.html | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/examples/index.html b/examples/index.html
index 743ccc4c..d8838cf4 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -8,12 +8,11 @@
-
-
+
From 03b04ec460b08adbfe9a6fd1f9c31be0244702a3 Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:25:35 +0000
Subject: [PATCH 13/34] Fix offset for bootstrap 5
---
examples/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/index.html b/examples/index.html
index d8838cf4..089e8ac0 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -26,7 +26,7 @@
' +
'' +
diff --git a/tests/plugins-gui.module.js b/tests/plugins-gui.module.js
index 00a131a1..b7f91fe4 100644
--- a/tests/plugins-gui.module.js
+++ b/tests/plugins-gui.module.js
@@ -131,9 +131,9 @@ $(function(){
$b.queryBuilder('validate');
assert.equal(
- $('#builder_group_0 .error-container').eq(0).data('toggle'),
+ $('#builder_group_0 .error-container').eq(0).data('bs-toggle'),
'tooltip',
- 'Should have added data-toggle="tooltip" in the template'
+ 'Should have added data-bs-toggle="tooltip" in the template'
);
assert.equal(
@@ -201,7 +201,7 @@ $(function(){
});
assert.ok(
- $('#builder_rule_0 button.filter-description').data('toggle') == 'popover',
+ $('#builder_rule_0 button.filter-description').data('bs-toggle') == 'popover',
'Rule should contain a new button enabled with Popover'
);
@@ -216,7 +216,7 @@ $(function(){
});
assert.ok(
- $('#builder_rule_0 button.filter-description').data('toggle') == 'bootbox',
+ $('#builder_rule_0 button.filter-description').data('bs-toggle') == 'bootbox',
'Rule should contain a new button enabled with Bootbox'
);
});
From 60e5e818b3a6dda258f573ac679e4ea0ef4a5e3b Mon Sep 17 00:00:00 2001
From: Stephen Morton Output
- + @@ -146,7 +146,7 @@Output
plugins: { 'bt-tooltip-errors': { delay: 100 }, 'sortable': null, - 'filter-description': { mode: 'bootbox' }, + // 'filter-description': { mode: 'bootbox' }, 'bt-selectpicker': null, // 'chosen-selectpicker': null, 'unique-filter': null, From 6692f82d62bef2513af560659fcd0b13def7cba7 Mon Sep 17 00:00:00 2001 From: David EthellOutput
- + @@ -147,7 +147,7 @@Output
'bt-tooltip-errors': { delay: 100 }, 'sortable': null, // 'filter-description': { mode: 'bootbox' }, - 'bt-selectpicker': null, + // 'bt-selectpicker': null, // 'chosen-selectpicker': null, 'unique-filter': null, 'bt-checkbox': { color: 'primary' }, From ae3fb1aa74bd6f4b19340e29c825da9dee1195c9 Mon Sep 17 00:00:00 2001 From: Liam
-
+
From 56bd7c954bc0326b3a0f29e6a8f6db89f576befd Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:25:59 +0000
Subject: [PATCH 14/34] dark mode
---
examples/index.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/examples/index.html b/examples/index.html
index 089e8ac0..15735b7f 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -40,10 +40,10 @@ jQuery QueryBuilder
From 56bd7c954bc0326b3a0f29e6a8f6db89f576befd Mon Sep 17 00:00:00 2001
From: Liam jQuery QueryBuilder
@@ -520,7 +520,7 @@ Output
// change theme
$('.change-theme').on('click', function() {
$('#qb-theme').replaceWith('');
- $('#bt-theme').replaceWith('');
+ $('[data-bs-theme]').attr('data-bs-theme', $(this).data('bt'));
});
// set rules
From 45066c2039789b382c73818e1fe7a090b57a7f0f Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:26:06 +0000
Subject: [PATCH 15/34] tooltip
---
examples/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/index.html b/examples/index.html
index 15735b7f..ac42302c 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -642,7 +642,7 @@ Output
// set filters
$('.set-filters').on('click', function() {
$(this).prop('disabled', true);
- // $(this).tooltip('hide');
+ bootstrap.Tooltip.getInstance($(this)).hide();
// add a new filter after 'state'
$('#builder').queryBuilder('addFilter',
From 8fd9d3833c6f7006f4521e2a6bf3ac73fa4f5645 Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:26:17 +0000
Subject: [PATCH 16/34] default theme
---
examples/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/index.html b/examples/index.html
index ac42302c..1f3a7ab1 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -1,5 +1,5 @@
-
+
From 78537dbff523ba165f00bf6daf57453e055c6fc8 Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:26:27 +0000
Subject: [PATCH 17/34] float-end logo
---
examples/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/index.html b/examples/index.html
index 1f3a7ab1..230dca33 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -28,7 +28,7 @@
-
+
jQuery QueryBuilder
From 6166b29d4da7a01af1a59fb6bd16257d118cbdab Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:30:24 +0000
Subject: [PATCH 18/34] new lock file
---
yarn.lock | 200 ++++++++++++++++++++++++++++--------------------------
1 file changed, 104 insertions(+), 96 deletions(-)
diff --git a/yarn.lock b/yarn.lock
index 59f98575..5978e171 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,21 +3,21 @@
"@babel/parser@^7.9.4":
- "integrity" "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
- "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.22.5.tgz"
- "version" "7.22.5"
+ "integrity" "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw=="
+ "resolved" "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz"
+ "version" "7.23.0"
"@babel/runtime@^7.21.0":
- "integrity" "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA=="
- "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.5.tgz"
- "version" "7.22.5"
+ "integrity" "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g=="
+ "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz"
+ "version" "7.23.1"
dependencies:
- "regenerator-runtime" "^0.13.11"
+ "regenerator-runtime" "^0.14.0"
-"@interactjs/types@1.10.17":
- "integrity" "sha512-X2JpoM7xUw0p9Me0tMaI0HNfcF/Hd07ZZlzpnpEMpGerUZOLoyeThrV9P+CrBHxZrluWJrigJbcdqXliFd0YMA=="
- "resolved" "https://registry.npmjs.org/@interactjs/types/-/types-1.10.17.tgz"
- "version" "1.10.17"
+"@interactjs/types@1.10.19":
+ "integrity" "sha512-oEqGmt9/Ob+jz0FUaBzpDXBmf+2dfdhPuEwQcMGH6nQTR2ETGtYIlAnQtADHvnCin+cVkrmqVohfHBysyQr4Lw=="
+ "resolved" "https://registry.npmjs.org/@interactjs/types/-/types-1.10.19.tgz"
+ "version" "1.10.19"
"@isaacs/cliui@^8.0.2":
"integrity" "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA=="
@@ -36,7 +36,7 @@
"resolved" "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
"version" "0.11.0"
-"@popperjs/core@^2.11.8":
+"@popperjs/core@^2.0.0", "@popperjs/core@^2.11.8":
"integrity" "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="
"resolved" "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz"
"version" "2.11.8"
@@ -49,9 +49,9 @@
"jquery-ui" "^1.13.2"
"@types/linkify-it@*":
- "integrity" "sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="
- "resolved" "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.2.tgz"
- "version" "3.0.2"
+ "integrity" "sha512-pTjcqY9E4nOI55Wgpz7eiI8+LzdYnw3qxXCfHyBDdPbYvbyLgWLJGh8EdPvqawwMK1Uo1794AUkkR38Fr0g+2g=="
+ "resolved" "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.3.tgz"
+ "version" "3.0.3"
"@types/markdown-it@*", "@types/markdown-it@^12.2.3":
"integrity" "sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="
@@ -225,10 +225,15 @@
"resolved" "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
"version" "1.0.0"
-"bootstrap-icons@^1.10.5":
- "integrity" "sha512-oSX26F37V7QV7NCE53PPEL45d7EGXmBgHG3pDpZvcRaKVzWMqIRL9wcqJUyEha1esFtM3NJzvmxFXDxjJYD0jQ=="
- "resolved" "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.10.5.tgz"
- "version" "1.10.5"
+"bootbox@^6.0.0":
+ "integrity" "sha512-+Calbj1v5UvxAXXDAHfoBlsx63Hcz1JqHaZdJ5EjIcOlkyAbZLCreVScx0Em6ZUvsMCqynuz/3nGDyd9FtFrNQ=="
+ "resolved" "https://registry.npmjs.org/bootbox/-/bootbox-6.0.0.tgz"
+ "version" "6.0.0"
+
+"bootstrap-icons@^1.11.3":
+ "integrity" "sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww=="
+ "resolved" "https://registry.npmjs.org/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz"
+ "version" "1.11.3"
"bootstrap-select@^1.14.0-beta3":
"integrity" "sha512-wYUDY4NAYBcNydXybE7wh3+ucyf+AcUOhZ+e0TFIoZ38A+k/3BVT1RPl5f0CiPxAexP1IQuqALKMqI8wtZS71A=="
@@ -240,15 +245,14 @@
"resolved" "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-10.6.2.tgz"
"version" "10.6.2"
-"bootstrap@^5.3.0", "bootstrap@>=3.0.0":
- "integrity" "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g=="
- "resolved" "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz"
- "version" "5.3.1"
+"bootstrap@^4.4.0 || ^5.0.0", "bootstrap@^5.3.0", "bootstrap@>=3.0.0":
+ "integrity" "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g=="
+ "resolved" "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.2.tgz"
+ "version" "5.3.2"
"bootswatch-dist@git+https://github.com/dbtek/bootswatch-dist.git#slate":
- "integrity" "sha512-oNubODLmDcRP8Tg7CL6C7rUvEF+eIDxRHzGwJ0NBkfGxbRHtJdDjT9uniAbg6nJ47Bx6mezvviS+ieQ77slweA=="
- "resolved" "git+ssh://git@github.com/dbtek/bootswatch-dist.git"
- "version" "2.0.0"
+ "resolved" "git+ssh://git@github.com/dbtek/bootswatch-dist.git#f55986534babf801f99fde84e7144ca7a584263b"
+ "version" "v3.3.7-slate"
"brace-expansion@^1.1.7":
"integrity" "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="
@@ -407,9 +411,9 @@
"version" "0.0.1"
"concurrently@^8.2.0":
- "integrity" "sha512-nnLMxO2LU492mTUj9qX/az/lESonSZu81UznYDoXtz1IQf996ixVqPAgHXwvHiHCAef/7S8HIK+fTFK7Ifk8YA=="
- "resolved" "https://registry.npmjs.org/concurrently/-/concurrently-8.2.0.tgz"
- "version" "8.2.0"
+ "integrity" "sha512-nVraf3aXOpIcNud5pB9M82p1tynmZkrSGQ1p6X/VY8cJ+2LMVqAgXsJxYYefACSHbTYlm92O1xuhdGTjwoEvbQ=="
+ "resolved" "https://registry.npmjs.org/concurrently/-/concurrently-8.2.1.tgz"
+ "version" "8.2.1"
dependencies:
"chalk" "^4.1.2"
"date-fns" "^2.30.0"
@@ -830,6 +834,11 @@
"resolved" "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
"version" "1.0.0"
+"fsevents@~2.3.2":
+ "integrity" "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="
+ "resolved" "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
+ "version" "2.3.3"
+
"function-bind@^1.1.1":
"integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
"resolved" "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
@@ -853,15 +862,15 @@
"is-glob" "^4.0.1"
"glob@^10.3.1":
- "integrity" "sha512-9BKYcEeIs7QwlCYs+Y3GBvqAMISufUS0i2ELd11zpZjxI5V9iyRj0HgzB5/cLf2NY4vcYBTYzJ7GIui7j/4DOw=="
- "resolved" "https://registry.npmjs.org/glob/-/glob-10.3.1.tgz"
- "version" "10.3.1"
+ "integrity" "sha512-wCMbE1m9Nx5yD9LYtgsVWq5VhHlk5WzJirw594qZR6AIvQYuHrdDtIktUVjQItalD53y7dqoedu9xP0u0WaxIQ=="
+ "resolved" "https://registry.npmjs.org/glob/-/glob-10.3.7.tgz"
+ "version" "10.3.7"
dependencies:
"foreground-child" "^3.1.0"
"jackspeak" "^2.0.3"
"minimatch" "^9.0.1"
- "minipass" "^5.0.0 || ^6.0.2"
- "path-scurry" "^1.10.0"
+ "minipass" "^5.0.0 || ^6.0.2 || ^7.0.0"
+ "path-scurry" "^1.10.1"
"glob@^7.1.2":
"integrity" "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="
@@ -1038,12 +1047,12 @@
"version" "3.1.4"
"handlebars@^4.0.11":
- "integrity" "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="
- "resolved" "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"
- "version" "4.7.7"
+ "integrity" "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ=="
+ "resolved" "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz"
+ "version" "4.7.8"
dependencies:
"minimist" "^1.2.5"
- "neo-async" "^2.6.0"
+ "neo-async" "^2.6.2"
"source-map" "^0.6.1"
"wordwrap" "^1.0.0"
optionalDependencies:
@@ -1161,9 +1170,9 @@
"version" "1.0.1"
"immutable@^4.0.0":
- "integrity" "sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg=="
- "resolved" "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
- "version" "4.3.0"
+ "integrity" "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="
+ "resolved" "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"
+ "version" "4.3.4"
"inflight@^1.0.4":
"integrity" "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="
@@ -1189,11 +1198,11 @@
"version" "1.3.8"
"interactjs@^1.3.3":
- "integrity" "sha512-grjHJgnWkCoQLmAlk2yalNd1r0ztUhXLJNVjSOfWn1wfNNgU2tx1cDEkro9WYerDNC9UG3MZTeD4O6zOM5gbIA=="
- "resolved" "https://registry.npmjs.org/interactjs/-/interactjs-1.10.17.tgz"
- "version" "1.10.17"
+ "integrity" "sha512-5zWXBrfLnXAyhrxKlhRiud/JxWd3GvZkvdTf8bqjeHWDx9zgiu+qFNA3nnJMszadFCig2GU5zKx9PYrkT87OKA=="
+ "resolved" "https://registry.npmjs.org/interactjs/-/interactjs-1.10.19.tgz"
+ "version" "1.10.19"
dependencies:
- "@interactjs/types" "1.10.17"
+ "@interactjs/types" "1.10.19"
"interpret@~1.1.0":
"integrity" "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA=="
@@ -1215,10 +1224,10 @@
dependencies:
"binary-extensions" "^2.0.0"
-"is-core-module@^2.11.0":
- "integrity" "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg=="
- "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.1.tgz"
- "version" "2.12.1"
+"is-core-module@^2.13.0":
+ "integrity" "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ=="
+ "resolved" "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz"
+ "version" "2.13.0"
dependencies:
"has" "^1.0.3"
@@ -1293,9 +1302,9 @@
"version" "3.0.1"
"jackspeak@^2.0.3":
- "integrity" "sha512-MXbxovZ/Pm42f6cDIDkl3xpwv1AGwObKwfmjs2nQePiy85tP3fatofl3FC1aBsOtP/6fq5SbtgHwWcMsLP+bDw=="
- "resolved" "https://registry.npmjs.org/jackspeak/-/jackspeak-2.2.1.tgz"
- "version" "2.2.1"
+ "integrity" "sha512-R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg=="
+ "resolved" "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz"
+ "version" "2.3.3"
dependencies:
"@isaacs/cliui" "^8.0.2"
optionalDependencies:
@@ -1316,9 +1325,9 @@
"jquery" ">=1.8.0 <4.0.0"
"jquery@^1.7.0 || ^2 || ^3", "jquery@^3.5.1", "jquery@>=1.4.4", "jquery@>=1.8.0 <4.0.0", "jquery@>=1.9.1", "jquery@1.9.1 - 3":
- "integrity" "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ=="
- "resolved" "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz"
- "version" "3.7.0"
+ "integrity" "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
+ "resolved" "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
+ "version" "3.7.1"
"js-yaml@~3.14.0":
"integrity" "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="
@@ -1455,9 +1464,9 @@
"version" "4.17.21"
"lru-cache@^9.1.1 || ^10.0.0":
- "integrity" "sha512-svTf/fzsKHffP42sujkO/Rjs37BCIsQVRCeNYIm9WN8rgT7ffoUnRtZCqU+6BqcSBdv8gwJeTz8knJpgACeQMw=="
- "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.0.tgz"
- "version" "10.0.0"
+ "integrity" "sha512-IJ4uwUTi2qCccrioU6g9g/5rvvVl13bsdczUUcqbciD9iLr095yj8DQKdObriEvuNSx325N1rV1O0sJFszx75g=="
+ "resolved" "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.1.tgz"
+ "version" "10.0.1"
"lunr@^1.0.0":
"integrity" "sha512-vGgr9YUMBfL1izpsb4RASwPz58JSSdmcTocuCs2v0PyGU3e7CDJWuS5psl4O2m9t0CsNemeR+jhxu2xNkXCM2A=="
@@ -1564,9 +1573,9 @@
"brace-expansion" "^1.1.7"
"minimatch@^9.0.1":
- "integrity" "sha512-PZOT9g5v2ojiTL7r1xF6plNHLtOeTpSlDI007As2NlA2aYBMfVom17yqa6QzhmDP8QOhn7LjHTg7DFCVSSa6yg=="
- "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-9.0.2.tgz"
- "version" "9.0.2"
+ "integrity" "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg=="
+ "resolved" "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz"
+ "version" "9.0.3"
dependencies:
"brace-expansion" "^2.0.1"
@@ -1575,10 +1584,10 @@
"resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz"
"version" "1.2.8"
-"minipass@^5.0.0 || ^6.0.2":
- "integrity" "sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w=="
- "resolved" "https://registry.npmjs.org/minipass/-/minipass-6.0.2.tgz"
- "version" "6.0.2"
+"minipass@^5.0.0 || ^6.0.2 || ^7.0.0":
+ "integrity" "sha512-LhbbwCfz3vsb12j/WkWQPZfKTsgqIe1Nf/ti1pKjYESGLHIVjWU96G9/ljLH4F9mWNVhlQOm0VySdAWzf05dpg=="
+ "resolved" "https://registry.npmjs.org/minipass/-/minipass-7.0.3.tgz"
+ "version" "7.0.3"
"mkdirp@^1.0.4":
"integrity" "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
@@ -1621,7 +1630,7 @@
"resolved" "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
"version" "0.6.3"
-"neo-async@^2.6.0":
+"neo-async@^2.6.2":
"integrity" "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
"resolved" "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
"version" "2.6.2"
@@ -1815,13 +1824,13 @@
dependencies:
"path-root-regex" "^0.1.0"
-"path-scurry@^1.10.0":
- "integrity" "sha512-tZFEaRQbMLjwrsmidsGJ6wDMv0iazJWk6SfIKnY4Xru8auXgmJkOBa5DUbYFcFD2Rzk2+KDlIiF0GVXNCbgC7g=="
- "resolved" "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.0.tgz"
- "version" "1.10.0"
+"path-scurry@^1.10.1":
+ "integrity" "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ=="
+ "resolved" "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz"
+ "version" "1.10.1"
dependencies:
"lru-cache" "^9.1.1 || ^10.0.0"
- "minipass" "^5.0.0 || ^6.0.2"
+ "minipass" "^5.0.0 || ^6.0.2 || ^7.0.0"
"pause-stream@^0.0.11":
"integrity" "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="
@@ -1893,10 +1902,10 @@
dependencies:
"resolve" "^1.9.0"
-"regenerator-runtime@^0.13.11":
- "integrity" "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
- "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
- "version" "0.13.11"
+"regenerator-runtime@^0.14.0":
+ "integrity" "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
+ "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz"
+ "version" "0.14.0"
"require-directory@^2.1.1":
"integrity" "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="
@@ -1919,11 +1928,11 @@
"global-modules" "^1.0.0"
"resolve@^1.19.0", "resolve@^1.9.0":
- "integrity" "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g=="
- "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz"
- "version" "1.22.2"
+ "integrity" "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="
+ "resolved" "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"
+ "version" "1.22.6"
dependencies:
- "is-core-module" "^2.11.0"
+ "is-core-module" "^2.13.0"
"path-parse" "^1.0.7"
"supports-preserve-symlinks-flag" "^1.0.0"
@@ -1967,19 +1976,18 @@
"postcss" "^7.0.27"
"sass@^1.63.6":
- "integrity" "sha512-MJuxGMHzaOW7ipp+1KdELtqKbfAWbH7OLIdoSMnVe3EXPMTmxTmlaZDCTsgIpPCs3w99lLo9/zDKkOrJuT5byw=="
- "resolved" "https://registry.npmjs.org/sass/-/sass-1.63.6.tgz"
- "version" "1.63.6"
+ "integrity" "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA=="
+ "resolved" "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz"
+ "version" "1.68.0"
dependencies:
"chokidar" ">=3.0.0 <4.0.0"
"immutable" "^4.0.0"
"source-map-js" ">=0.6.2 <2.0.0"
-
-semver@^5.7.1:
- version "5.7.2"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
- integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
+"semver@^5.7.1":
+ "integrity" "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g=="
+ "resolved" "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz"
+ "version" "5.7.2"
"semver@~7.0.0":
"integrity" "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
@@ -2046,9 +2054,9 @@ semver@^5.7.1:
"version" "1.8.1"
"signal-exit@^4.0.1":
- "integrity" "sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q=="
- "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-4.0.2.tgz"
- "version" "4.0.2"
+ "integrity" "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw=="
+ "resolved" "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz"
+ "version" "4.1.0"
"simple-update-notifier@^1.0.7":
"integrity" "sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="
@@ -2090,9 +2098,9 @@ semver@^5.7.1:
"through" "2"
"sprintf-js@^1.1.1":
- "integrity" "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
- "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"
- "version" "1.1.2"
+ "integrity" "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="
+ "resolved" "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"
+ "version" "1.1.3"
"sprintf-js@~1.0.2":
"integrity" "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="
@@ -2264,9 +2272,9 @@ semver@^5.7.1:
"version" "1.2.2"
"tslib@^2.1.0":
- "integrity" "sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA=="
- "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz"
- "version" "2.6.0"
+ "integrity" "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+ "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz"
+ "version" "2.6.2"
"uc.micro@^1.0.1", "uc.micro@^1.0.5":
"integrity" "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
From 3664b945a2473256d2639947fa8585d9455363ed Mon Sep 17 00:00:00 2001
From: Liam
Date: Wed, 17 Jan 2024 11:33:14 +0000
Subject: [PATCH 19/34] Use btn-sm instead of css hack
---
src/plugins/bt-selectpicker/plugin.js | 4 ++--
src/plugins/filter-description/plugin.js | 4 ++--
src/plugins/invert/plugin.js | 4 ++--
src/plugins/not-group/plugin.js | 2 +-
src/scss/default.scss | 9 ---------
src/template.js | 10 +++++-----
6 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/plugins/bt-selectpicker/plugin.js b/src/plugins/bt-selectpicker/plugin.js
index d9ef2812..363083ee 100644
--- a/src/plugins/bt-selectpicker/plugin.js
+++ b/src/plugins/bt-selectpicker/plugin.js
@@ -4,7 +4,7 @@
* @descriptioon Applies Bootstrap Select on filters and operators combo-boxes.
* @param {object} [options]
* @param {string} [options.container='body']
- * @param {string} [options.style='btn-inverse btn-xs']
+ * @param {string} [options.style='btn-inverse btn-sm']
* @param {int|string} [options.width='auto']
* @param {boolean} [options.showIcon=false]
* @throws MissingLibraryError
@@ -40,7 +40,7 @@ QueryBuilder.define('bt-selectpicker', function(options) {
});
}, {
container: 'body',
- style: 'btn-inverse btn-xs',
+ style: 'btn-inverse btn-sm',
width: 'auto',
showIcon: false
});
diff --git a/src/plugins/filter-description/plugin.js b/src/plugins/filter-description/plugin.js
index 066d1956..3027e761 100644
--- a/src/plugins/filter-description/plugin.js
+++ b/src/plugins/filter-description/plugin.js
@@ -49,7 +49,7 @@ QueryBuilder.define('filter-description', function(options) {
}
else {
if ($b.length === 0) {
- $b = $($.parseHTML(''));
+ $b = $($.parseHTML(''));
$b.prependTo(rule.$el.find(QueryBuilder.selectors.rule_actions));
const popover = new bootstrap.Popover($b.get(0), {
placement: 'left',
@@ -87,7 +87,7 @@ QueryBuilder.define('filter-description', function(options) {
}
else {
if ($b.length === 0) {
- $b = $($.parseHTML(''));
+ $b = $($.parseHTML(''));
$b.prependTo(rule.$el.find(QueryBuilder.selectors.rule_actions));
$b.on('click', function() {
diff --git a/src/plugins/invert/plugin.js b/src/plugins/invert/plugin.js
index 34da6ca0..8b0ab7ef 100644
--- a/src/plugins/invert/plugin.js
+++ b/src/plugins/invert/plugin.js
@@ -33,7 +33,7 @@ QueryBuilder.define('invert', function(options) {
this.on('getGroupTemplate.filter', function(h) {
var $h = $($.parseHTML(h.value));
$h.find(Selectors.condition_container).after(
- '
Output
// set filters $('.set-filters').on('click', function() { $(this).prop('disabled', true); - // $(this).tooltip('hide'); + bootstrap.Tooltip.getInstance($(this)).hide(); // add a new filter after 'state' $('#builder').queryBuilder('addFilter', From 8fd9d3833c6f7006f4521e2a6bf3ac73fa4f5645 Mon Sep 17 00:00:00 2001 From: Liam
-
+
jQuery QueryBuilder
From 6166b29d4da7a01af1a59fb6bd16257d118cbdab Mon Sep 17 00:00:00 2001
From: Liam