datatables.net-searchbuilder 1.4.2 → 1.6.0

package/js/dataTables.searchBuilder.mjs

@@ -1,10 +1,13 @@
-/*! SearchBuilder 1.4.2
+/*! SearchBuilder 1.6.0
  * ©SpryMedia Ltd - datatables.net/license/mit
  */
 
-import $ from 'jquery';
+import jQuery from 'jquery';
 import DataTable from 'datatables.net';
 
+// Allow reassignment of the $ variable
+let $ = jQuery;
+
 (function () {
     'use strict';
 
@@ -29,11 +32,12 @@ import DataTable from 'datatables.net';
      * The Criteria class is used within SearchBuilder to represent a search criteria
      */
     var Criteria = /** @class */ (function () {
-        function Criteria(table, opts, topGroup, index, depth, serverData) {
+        function Criteria(table, opts, topGroup, index, depth, serverData, liveSearch) {
             var _this = this;
             if (index === void 0) { index = 0; }
             if (depth === void 0) { depth = 1; }
             if (serverData === void 0) { serverData = undefined; }
+            if (liveSearch === void 0) { liveSearch = false; }
             // Check that the required version of DataTables is included
             if (!dataTable$3 || !dataTable$3.versionCheck || !dataTable$3.versionCheck('1.10.0')) {
                 throw new Error('SearchPane requires DataTables 1.10 or newer');
@@ -53,6 +57,7 @@ import DataTable from 'datatables.net';
                 dt: table,
                 filled: false,
                 index: index,
+                liveSearch: liveSearch,
                 origData: undefined,
                 preventRedraw: false,
                 serverData: serverData,
@@ -145,6 +150,16 @@ import DataTable from 'datatables.net';
                 .replace(/>/g, '>')
                 .replace(/"/g, '"');
         };
+        /**
+         * Redraw the DataTable with the current search parameters
+         */
+        Criteria.prototype.doSearch = function () {
+            // Only do the search if live search is disabled, otherwise the search
+            // is triggered by the button at the top level group.
+            if (this.c.liveSearch) {
+                this.s.dt.draw();
+            }
+        };
         /**
          * Parses formatted numbers down to a form where they can be compared
          *
@@ -368,7 +383,7 @@ import DataTable from 'datatables.net';
                         $$3(this).prop('selected', true);
                         data_1.removeClass(italic_1);
                         foundData = true;
-                        dataIdx = $$3(this).val();
+                        dataIdx = parseInt($$3(this).val(), 10);
                     }
                     else {
                         $$3(this).removeProp('selected');
@@ -450,7 +465,7 @@ import DataTable from 'datatables.net';
                         // remove it from the search and trigger a new search
                         if (_this.s.filled) {
                             _this.s.filled = false;
-                            _this.s.dt.draw();
+                            _this.doSearch();
                             _this.setListeners();
                         }
                         _this.s.dt.state.save();
@@ -491,13 +506,13 @@ import DataTable from 'datatables.net';
                             // it from the search and trigger a new search
                             if (_this.s.filled && val !== undefined && _this.dom.inputCont.has(val[0]).length !== 0) {
                                 _this.s.filled = false;
-                                _this.s.dt.draw();
+                                _this.doSearch();
                                 _this.setListeners();
                             }
                         }
                         if (_this.dom.value.length === 0 ||
                             _this.dom.value.length === 1 && _this.dom.value[0] === undefined) {
-                            _this.s.dt.draw();
+                            _this.doSearch();
                         }
                     }
                     else {
@@ -885,7 +900,7 @@ import DataTable from 'datatables.net';
                 // If using SSP we want to restrict the amount of server calls that take place
                 //  and this will already have taken place
                 if (!this.s.dt.page.info().serverSide) {
-                    this.s.dt.draw();
+                    this.doSearch();
                 }
                 this.setListeners();
             }
@@ -1221,13 +1236,15 @@ import DataTable from 'datatables.net';
         Criteria.initDate = function (that, fn, preDefined) {
             if (preDefined === void 0) { preDefined = null; }
             var searchDelay = that.s.dt.settings()[0].searchDelay;
+            var i18n = that.s.dt.i18n('datetime', {});
             // Declare date element using DataTables dateTime plugin
             var el = $$3('<input/>')
                 .addClass(Criteria.classes.value)
                 .addClass(Criteria.classes.input)
                 .dtDateTime({
                 attachTo: 'input',
-                format: that.s.dateFormat ? that.s.dateFormat : undefined
+                format: that.s.dateFormat ? that.s.dateFormat : undefined,
+                i18n: i18n
             })
                 .on('change.dtsb', that._throttle(function () {
                 return fn(that, this);
@@ -1262,6 +1279,7 @@ import DataTable from 'datatables.net';
             var _this = this;
             if (preDefined === void 0) { preDefined = null; }
             var searchDelay = that.s.dt.settings()[0].searchDelay;
+            var i18n = that.s.dt.i18n('datetime', {});
             // Declare all of the date elements that are required using DataTables dateTime plugin
             var els = [
                 $$3('<input/>')
@@ -1269,7 +1287,8 @@ import DataTable from 'datatables.net';
                     .addClass(Criteria.classes.input)
                     .dtDateTime({
                     attachTo: 'input',
-                    format: that.s.dateFormat ? that.s.dateFormat : undefined
+                    format: that.s.dateFormat ? that.s.dateFormat : undefined,
+                    i18n: i18n
                 })
                     .on('change.dtsb', searchDelay !== null ?
                     that.s.dt.settings()[0].oApi._fnThrottle(function () {
@@ -1292,7 +1311,8 @@ import DataTable from 'datatables.net';
                     .addClass(Criteria.classes.input)
                     .dtDateTime({
                     attachTo: 'input',
-                    format: that.s.dateFormat ? that.s.dateFormat : undefined
+                    format: that.s.dateFormat ? that.s.dateFormat : undefined,
+                    i18n: i18n
                 })
                     .on('change.dtsb', searchDelay !== null ?
                     that.s.dt.settings()[0].oApi._fnThrottle(function () {
@@ -1402,7 +1422,7 @@ import DataTable from 'datatables.net';
                     !(that.s.dt.settings()[0].oInit.search !== undefined &&
                         that.s.dt.settings()[0].oInit.search["return"]) ||
                     code === 13) {
-                    that.s.dt.draw();
+                    that.doSearch();
                 }
                 return;
             }
@@ -1446,7 +1466,7 @@ import DataTable from 'datatables.net';
                     that.s.dt.settings()[0].oInit.search["return"]) ||
                 code === 13) {
                 // Trigger a search
-                that.s.dt.draw();
+                that.doSearch();
             }
             // Refocus the element and set the correct cursor position
             if (idx !== null) {
@@ -2374,6 +2394,7 @@ import DataTable from 'datatables.net';
                 logicOr: 'Or',
                 right: '>',
                 rightTitle: 'Indent criteria',
+                search: 'Search',
                 title: {
                     0: 'Custom Search Builder',
                     _: 'Custom Search Builder (%d)'
@@ -2447,7 +2468,12 @@ import DataTable from 'datatables.net';
                     .addClass(this.classes.button)
                     .attr('type', 'button'),
                 logicContainer: $$2('<div/>')
-                    .addClass(this.classes.logicContainer)
+                    .addClass(this.classes.logicContainer),
+                search: $$2('<button/>')
+                    .addClass(this.classes.search)
+                    .addClass(this.classes.button)
+                    .attr('type', 'button')
+                    .css('display', 'none')
             };
             // A reference to the top level group is maintained throughout any subgroups and criteria that may be created
             if (this.s.topGroup === undefined) {
@@ -2463,6 +2489,7 @@ import DataTable from 'datatables.net';
             // Turn off listeners
             this.dom.add.off('.dtsb');
             this.dom.logic.off('.dtsb');
+            this.dom.search.off('.dtsb');
             // Trigger event for groups at a higher level to pick up on
             this.dom.container
                 .trigger('dtsb-destroy')
@@ -2546,7 +2573,8 @@ import DataTable from 'datatables.net';
             this.dom.container.children().detach();
             this.dom.container
                 .append(this.dom.logicContainer)
-                .append(this.dom.add);
+                .append(this.dom.add)
+                .append(this.dom.search);
             // Sort the criteria by index so that they appear in the correct order
             this.s.criteria.sort(function (a, b) {
                 if (a.criteria.s.index < b.criteria.s.index) {
@@ -2633,10 +2661,14 @@ import DataTable from 'datatables.net';
                     // Set criteria left margin
                     this.dom.container.css('margin-left', 0);
                 }
+                this.dom.search.css('display', 'none');
                 return;
             }
             this.dom.clear.height('0px');
             this.dom.logicContainer.append(this.dom.clear);
+            if (!this.s.isChild) {
+                this.dom.search.css('display', 'inline-block');
+            }
             // Prepend logic button
             this.dom.container.prepend(this.dom.logicContainer);
             for (var _i = 0, _a = this.s.criteria; _i < _a.length; _i++) {
@@ -2684,6 +2716,9 @@ import DataTable from 'datatables.net';
                 _this.s.dt.state.save();
                 return false;
             });
+            this.dom.search.on('click.dtsb', function () {
+                _this.s.dt.draw();
+            });
             for (var _i = 0, _a = this.s.criteria; _i < _a.length; _i++) {
                 var crit = _a[_i];
                 crit.criteria.setListeners();
@@ -2699,7 +2734,7 @@ import DataTable from 'datatables.net';
         Group.prototype.addCriteria = function (crit) {
             if (crit === void 0) { crit = null; }
             var index = crit === null ? this.s.criteria.length : crit.s.index;
-            var criteria = new Criteria(this.s.dt, this.s.opts, this.s.topGroup, index, this.s.depth, this.s.serverData);
+            var criteria = new Criteria(this.s.dt, this.s.opts, this.s.topGroup, index, this.s.depth, this.s.serverData, this.c.liveSearch);
             // If a Criteria has been passed in then set the values to continue that
             if (crit !== null) {
                 criteria.c = crit.c;
@@ -3024,6 +3059,7 @@ import DataTable from 'datatables.net';
         Group.prototype._setup = function () {
             this.setListeners();
             this.dom.add.html(this.s.dt.i18n('searchBuilder.add', this.c.i18n.add));
+            this.dom.search.html(this.s.dt.i18n('searchBuilder.search', this.c.i18n.search));
             this.dom.logic.children().first().html(this.c.logic === 'OR'
                 ? this.s.dt.i18n('searchBuilder.logicOr', this.c.i18n.logicOr)
                 : this.s.dt.i18n('searchBuilder.logicAnd', this.c.i18n.logicAnd));
@@ -3037,7 +3073,9 @@ import DataTable from 'datatables.net';
             if (this.s.isChild) {
                 this.dom.container.append(this.dom.logicContainer);
             }
-            this.dom.container.append(this.dom.add);
+            this.dom.container
+                .append(this.dom.add)
+                .append(this.dom.search);
         };
         /**
          * Sets the listener for the logic button
@@ -3077,7 +3115,8 @@ import DataTable from 'datatables.net';
             group: 'dtsb-group',
             inputButton: 'dtsb-iptbtn',
             logic: 'dtsb-logic',
-            logicContainer: 'dtsb-logicContainer'
+            logicContainer: 'dtsb-logicContainer',
+            search: 'dtsb-search'
         };
         Group.defaults = {
             columns: true,
@@ -3096,6 +3135,7 @@ import DataTable from 'datatables.net';
             enterSearch: false,
             filterChanged: undefined,
             greyscale: false,
+            liveSearch: true,
             i18n: {
                 add: 'Add Condition',
                 button: {
@@ -3113,6 +3153,7 @@ import DataTable from 'datatables.net';
                 logicOr: 'Or',
                 right: '>',
                 rightTitle: 'Indent criteria',
+                search: 'Search',
                 title: {
                     0: 'Custom Search Builder',
                     _: 'Custom Search Builder (%d)'
@@ -3531,6 +3572,7 @@ import DataTable from 'datatables.net';
                 var count = _this.s.topGroup.count();
                 _this._updateTitle(count);
                 _this._filterChanged(count);
+                _this._checkClear();
             });
             this.s.dt.on('postEdit.dtsb postCreate.dtsb postRemove.dtsb', function () {
                 _this.s.topGroup.redrawContents();
@@ -3554,7 +3596,7 @@ import DataTable from 'datatables.net';
                 _this.dom.clearAll.remove();
             });
         };
-        SearchBuilder.version = '1.4.2';
+        SearchBuilder.version = '1.6.0';
         SearchBuilder.classes = {
             button: 'dtsb-button',
             clearAll: 'dtsb-clearAll',
@@ -3580,6 +3622,7 @@ import DataTable from 'datatables.net';
             enterSearch: false,
             filterChanged: undefined,
             greyscale: false,
+            liveSearch: true,
             i18n: {
                 add: 'Add Condition',
                 button: {
@@ -3643,6 +3686,7 @@ import DataTable from 'datatables.net';
                 logicOr: 'Or',
                 right: '>',
                 rightTitle: 'Indent criteria',
+                search: 'Search',
                 title: {
                     0: 'Custom Search Builder',
                     _: 'Custom Search Builder (%d)'
@@ -3660,7 +3704,7 @@ import DataTable from 'datatables.net';
         return SearchBuilder;
     }());
 
-    /*! SearchBuilder 1.4.2
+    /*! SearchBuilder 1.6.0
      * ©SpryMedia Ltd - datatables.net/license/mit
      */
     setJQuery($);

package/package.json

@@ -4,7 +4,7 @@
     "main": "js/dataTables.searchBuilder.js",
     "module": "js/dataTables.searchBuilder.mjs",
     "types": "./types/types.d.ts",
-    "version": "1.4.2",
+    "version": "1.6.0",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",
@@ -21,7 +21,7 @@
         "sort"
     ],
     "dependencies": {
-        "datatables.net": ">=1.12.1",
+        "datatables.net": ">=1.13.4",
         "jquery": ">=1.7"
     },
     "moduleType": [

package/types/index.d.ts

@@ -1,4 +1,4 @@
-/*! SearchBuilder 1.4.2
+/*! SearchBuilder 1.5.0
  * ©SpryMedia Ltd - datatables.net/license/mit
  */
 export {};

package/types/types.d.ts

@@ -57,7 +57,7 @@ declare module 'datatables.net' {
 		searchBuilder: ApiSearchBuilder<T>;
 	}
 
-	interface ApiStatic {
+	interface DataTablesStatic {
 		/**
 		 * SearchBuilder class
 		 */