liamkeily · liamkeily · Jan 16, 2024 · Jan 16, 2024 · Jan 16, 2024 · Jan 16, 2024
diff --git a/build/jsdoc.md b/build/jsdoc.md
@@ -1,4 +1,4 @@
-# <i class="glyphicon glyphicon-home"></i> [Main documentation](..)
+# <i class="bi bi-house-fill"></i> [Main documentation](..)
 
 # Entry point: [$.fn.QueryBuilder](external-_jQuery.fn_.html)
 

diff --git a/examples/index.html b/examples/index.html
@@ -12,7 +12,7 @@
   <link rel="stylesheet" href="/node_modules/awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css">
   <link rel="stylesheet" href="/node_modules/bootstrap-slider/dist/css/bootstrap-slider.css">
   <link rel="stylesheet" href="/node_modules/selectize/dist/css/selectize.bootstrap3.css">
-
+  <link rel="stylesheet" href="/node_modules/bootstrap-icons/font/bootstrap-icons.css">
   <link rel="stylesheet" href="/dist/css/query-builder.default.css" id="qb-theme">
   <link rel="stylesheet" href="http://mistic100.github.io/jQuery-QueryBuilder/assets/flags/flags.css">
 
@@ -29,7 +29,7 @@
   <div class="col-md-12 col-lg-10 col-lg-offset-1">
     <div class="page-header">
       <a class="pull-right" href="https://github.com/mistic100/jQuery-QueryBuilder">
-        <img src="https://github.githubassets.com/images/modules/logos_page/Octocat.png" height=48px>
+        <img src="https://github.githubassets.com/assets/GitHub-Mark-ea2971cee799.png" style="height:48px;">
       </a>
       <h1>jQuery QueryBuilder
         <small>Example</small>
@@ -185,7 +185,7 @@ <h3>Output</h3>
           en: 'Name',
           fr: 'Nom'
         },
-        icon: 'glyphicon glyphicon-user',
+        icon: 'bi bi-person-fill',
         value_separator: ',',
         type: 'string',
         optgroup: 'core',
@@ -202,7 +202,7 @@ <h3>Output</h3>
       {
         id: 'age',
         label: 'Age',
-        icon: 'glyphicon glyphicon-calendar',
+        icon: 'bi bi-calendar3',
         type: 'integer',
         input: 'text',
         value_separator: '|',
@@ -219,7 +219,7 @@ <h3>Output</h3>
       {
         id: 'bson',
         label: 'BSON',
-        icon: 'glyphicon glyphicon-qrcode',
+        icon: 'bi bi-qr-code',
         type: 'string',
         input: 'textarea',
         operators: ['equal'],
@@ -232,7 +232,7 @@ <h3>Output</h3>
       {
         id: 'category',
         label: 'Category',
-        icon: 'glyphicon glyphicon-th-list',
+        icon: 'bi bi-list-task',
         type: 'integer',
         input: 'checkbox',
         optgroup: 'core',
@@ -258,7 +258,7 @@ <h3>Output</h3>
       {
         id: 'continent',
         label: 'Continent',
-        icon: 'glyphicon glyphicon-globe',
+        icon: 'bi bi-globe-americas',
         type: 'string',
         input: 'select',
         optgroup: 'core',
@@ -307,7 +307,7 @@ <h3>Output</h3>
       {
         id: 'state',
         label: 'State',
-        icon: 'glyphicon glyphicon-globe',
+        icon: 'bi bi-globe-americas',
         type: 'string',
         input: 'select',
         multiple: true,
@@ -343,7 +343,7 @@ <h3>Output</h3>
       {
         id: 'in_stock',
         label: 'In stock',
-        icon: 'glyphicon glyphicon-log-in',
+        icon: 'bi bi-box-arrow-in-right',
         type: 'integer',
         input: 'radio',
         optgroup: 'plugin',
@@ -359,7 +359,7 @@ <h3>Output</h3>
       {
         id: 'price',
         label: 'Price',
-        icon: 'glyphicon glyphicon-usd',
+        icon: 'bi bi-currency-dollar',
         type: 'double',
         size: 5,
         validation: {
@@ -376,7 +376,7 @@ <h3>Output</h3>
       {
         id: 'rate',
         label: 'Rate',
-        icon: 'glyphicon glyphicon-flash',
+        icon: 'bi bi-box-arrow-lightning-charge-fill',
         type: 'integer',
         validation: {
           min: 0,
@@ -400,7 +400,7 @@ <h3>Output</h3>
       {
         id: 'id',
         label: 'Identifier',
-        icon: 'glyphicon glyphicon-sunglasses',
+        icon: 'bi bi-sunglasses',
         type: 'string',
         optgroup: 'plugin',
         placeholder: '____-____-____',
@@ -419,7 +419,7 @@ <h3>Output</h3>
       {
         id: 'coord',
         label: 'Coordinates',
-        icon: 'glyphicon glyphicon-star-empty',
+        icon: 'bi bi-star',
         type: 'string',
         default_value: 'C.5',
         description: 'The letter is the cadran identifier:\
@@ -659,9 +659,5 @@ <h3>Output</h3>
     // also available : 'setFilters'
   });
 </script>
-
-<script>
-  document.write('<script src="//' + location.host.split(':')[0] + ':35729/livereload.js" async defer><' + '/script>');
-</script>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
   ],
   "dependencies": {
     "bootstrap": "^3.4.1",
+    "bootstrap-icons": "^1.11.3",
     "jquery": "^3.5.1",
     "jquery-extendext": "^1.0.0",
     "moment": "^2.29.1",

diff --git a/src/defaults.js b/src/defaults.js
@@ -187,10 +187,10 @@ 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 bi-plus-circle-fill',
+        add_rule:     'bi bi-plus-lg',
+        remove_group: 'bi bi-x-lg',
+        remove_rule:  'bi bi-x-lg',
+        error:        'bi bi-exclamation-triangle'
     }
 };
diff --git a/src/plugins/bt-checkbox/plugin.js b/src/plugins/bt-checkbox/plugin.js
@@ -3,12 +3,12 @@
  * @memberof module:plugins
  * @description Applies Awesome Bootstrap Checkbox for checkbox and radio inputs.
  * @param {object} [options]
- * @param {string} [options.font='glyphicons']
+ * @param {string} [options.font='bootstrap-icons']
  * @param {string} [options.color='default']
  */
 QueryBuilder.define('bt-checkbox', function(options) {
-    if (options.font == 'glyphicons') {
-        this.$el.addClass('bt-checkbox-glyphicons');
+    if (options.font === 'bootstrap-icons') {
+        this.$el.addClass('bt-checkbox-bootstrap-icons');
     }
 
     this.on('getRuleInput.filter', function(h, rule, name) {
@@ -40,6 +40,6 @@ QueryBuilder.define('bt-checkbox', function(options) {
         }
     });
 }, {
-    font: 'glyphicons',
+    font: 'bootstrap-icons',
     color: 'default'
 });
diff --git a/src/plugins/bt-checkbox/plugin.scss b/src/plugins/bt-checkbox/plugin.scss
@@ -1,12 +1,6 @@
-.query-builder.bt-checkbox-glyphicons {
+.query-builder.bt-checkbox-bootstrap-icons {
   .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;
+    font-family: 'bootstrap-icons';
+    content: '\F633'; // https://icons.getbootstrap.com/icons/check-lg/
   }
 }
diff --git a/src/plugins/filter-description/plugin.js b/src/plugins/filter-description/plugin.js
@@ -3,7 +3,7 @@
  * @memberof module:plugins
  * @description Provides three ways to display a description about a filter: inline, Bootsrap Popover or Bootbox.
  * @param {object} [options]
- * @param {string} [options.icon='glyphicon glyphicon-info-sign']
+ * @param {string} [options.icon='bi bi-info-circle-fill']
  * @param {string} [options.mode='popover'] - inline, popover or bootbox
  * @throws ConfigError
  */
@@ -105,7 +105,7 @@ QueryBuilder.define('filter-description', function(options) {
         });
     }
 }, {
-    icon: 'glyphicon glyphicon-info-sign',
+    icon: 'bi bi-info-circle-fill',
     mode: 'popover'
 });
 

diff --git a/src/plugins/invert/plugin.js b/src/plugins/invert/plugin.js
@@ -3,7 +3,7 @@
  * @memberof module:plugins
  * @description Allows to invert a rule operator, a group condition or the entire builder.
  * @param {object} [options]
- * @param {string} [options.icon='glyphicon glyphicon-random']
+ * @param {string} [options.icon='bi bi-shuffle']
  * @param {boolean} [options.recursive=true]
  * @param {boolean} [options.invert_rules=true]
  * @param {boolean} [options.display_rules_button=false]
@@ -53,7 +53,7 @@ QueryBuilder.define('invert', function(options) {
         }
     }
 }, {
-    icon: 'glyphicon glyphicon-random',
+    icon: 'bi bi-shuffle',
     recursive: true,
     invert_rules: true,
     display_rules_button: false,

diff --git a/src/plugins/not-group/plugin.js b/src/plugins/not-group/plugin.js
@@ -3,8 +3,8 @@
  * @memberof module:plugins
  * @description Adds a "Not" checkbox in front of group conditions.
  * @param {object} [options]
- * @param {string} [options.icon_checked='glyphicon glyphicon-checked']
- * @param {string} [options.icon_unchecked='glyphicon glyphicon-unchecked']
+ * @param {string} [options.icon_checked='bi bi-check2-square']
+ * @param {string} [options.icon_unchecked='bi bi-square']
  */
 QueryBuilder.define('not-group', function(options) {
     var self = this;
@@ -112,8 +112,8 @@ QueryBuilder.define('not-group', function(options) {
         e.value.not = !!data.not;
     });
 }, {
-    icon_unchecked: 'glyphicon glyphicon-unchecked',
-    icon_checked: 'glyphicon glyphicon-check',
+    icon_unchecked: 'bi bi-square',
+    icon_checked: 'bi bi-check2-square',
     disable_template: false
 });
 

diff --git a/src/plugins/sortable/plugin.js b/src/plugins/sortable/plugin.js
@@ -5,7 +5,7 @@
  * @param {object} [options]
  * @param {boolean} [options.inherit_no_drop=true]
  * @param {boolean} [options.inherit_no_sortable=true]
- * @param {string} [options.icon='glyphicon glyphicon-sort']
+ * @param {string} [options.icon='bi bi-sort-down']
  * @throws MissingLibraryError, ConfigError
  */
 QueryBuilder.define('sortable', function(options) {
@@ -177,7 +177,7 @@ QueryBuilder.define('sortable', function(options) {
 }, {
     inherit_no_sortable: true,
     inherit_no_drop: true,
-    icon: 'glyphicon glyphicon-sort',
+    icon: 'bi bi-sort-down',
     disable_template: false
 });