datatables.net-searchbuilder-bs 1.4.0 → 1.4.2

package/js/searchBuilder.bootstrap.js

@@ -11,30 +11,37 @@
 	}
 	else if ( typeof exports === 'object' ) {
 		// CommonJS
-		module.exports = function (root, $) {
-			if ( ! root ) {
-				// CommonJS environments without a window global must pass a
-				// root. This will give an error otherwise
-				root = window;
-			}
-
-			if ( ! $ ) {
-				$ = typeof window !== 'undefined' ? // jQuery's factory checks for a global window
-					require('jquery') :
-					require('jquery')( root );
-			}
-
+		var jq = require('jquery');
+		var cjsRequires = function (root, $) {
 			if ( ! $.fn.dataTable ) {
 				require('datatables.net-bs')(root, $);
 			}
 
-			if ( ! $.fn.dataTable ) {
+			if ( ! $.fn.dataTable.SearchBuilder ) {
 				require('datatables.net-searchbuilder')(root, $);
 			}
+		};
 
+		if (typeof window !== 'undefined') {
+			module.exports = function (root, $) {
+				if ( ! root ) {
+					// CommonJS environments without a window global must pass a
+					// root. This will give an error otherwise
+					root = window;
+				}
 
-			return factory( $, root, root.document );
-		};
+				if ( ! $ ) {
+					$ = jq( root );
+				}
+
+				cjsRequires( root, $ );
+				return factory( $, root, root.document );
+			};
+		}
+		else {
+			cjsRequires( window, jq );
+			module.exports = factory( jq, window, window.document );
+		}
 	}
 	else {
 		// Browser

package/js/searchBuilder.bootstrap.min.js

@@ -1,4 +1,4 @@
 /*! Bootstrap ui integration for DataTables' SearchBuilder
  * © SpryMedia Ltd - datatables.net/license
 */
-!function(n){"function"==typeof define&&define.amd?define(["jquery","datatables.net-bs","datatables.net-searchbuilder"],function(e){return n(e,window,document)}):"object"==typeof exports?module.exports=function(e,t){return e=e||window,(t=t||("undefined"!=typeof window?require("jquery"):require("jquery")(e))).fn.dataTable||require("datatables.net-bs")(e,t),t.fn.dataTable||require("datatables.net-searchbuilder")(e,t),n(t,0,e.document)}:n(jQuery,window,document)}(function(e,t,n,d){"use strict";var a=e.fn.dataTable;return e.extend(!0,a.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"}),e.extend(!0,a.Group.classes,{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"}),e.extend(!0,a.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"}),a});
+!function(n){var d,a;"function"==typeof define&&define.amd?define(["jquery","datatables.net-bs","datatables.net-searchbuilder"],function(t){return n(t,window,document)}):"object"==typeof exports?(d=require("jquery"),a=function(t,e){e.fn.dataTable||require("datatables.net-bs")(t,e),e.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(t,e)},"undefined"!=typeof window?module.exports=function(t,e){return t=t||window,e=e||d(t),a(t,e),n(e,0,t.document)}:(a(window,d),module.exports=n(d,window,window.document))):n(jQuery,window,document)}(function(t,e,n,d){"use strict";var a=t.fn.dataTable;return t.extend(!0,a.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"}),t.extend(!0,a.Group.classes,{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"}),t.extend(!0,a.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"}),a});

package/js/searchBuilder.bootstrap.min.mjs

@@ -1,4 +1,4 @@
 /*! Bootstrap ui integration for DataTables' SearchBuilder
  * © SpryMedia Ltd - datatables.net/license
 */
-import $ from"jquery";import DataTable from"datatables.net-bs";import"datatables.net-searchbuilder";$.extend(!0,DataTable.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"}),$.extend(!0,DataTable.Group.classes,{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"}),$.extend(!0,DataTable.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"});export default DataTable;
+import $ from"jquery";import DataTable from"datatables.net-bs";import SearchBuilder from"datatables.net-searchbuilder";$.extend(!0,DataTable.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"}),$.extend(!0,DataTable.Group.classes,{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"}),$.extend(!0,DataTable.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"});export default DataTable;

package/js/searchBuilder.bootstrap.mjs

@@ -4,8 +4,7 @@
 
 import $ from 'jquery';
 import DataTable from 'datatables.net-bs';
-import 'datatables.net-searchbuilder';
-
+import SearchBuilder from 'datatables.net-searchbuilder';
 
 $.extend(true, DataTable.SearchBuilder.classes, {
     clearAll: 'btn btn-default dtsb-clearAll'

package/package.json

@@ -5,7 +5,7 @@
     "module": "js/searchBuilder.bootstrap.mjs",
     "style": "css/searchBuilder.bootstrap.css",
     "types": "./types/types.d.ts",
-    "version": "1.4.0",
+    "version": "1.4.2",
     "files": [
         "css/**/*.css",
         "js/**/*.js",

package/types/types.d.ts

@@ -32,6 +32,22 @@ declare module 'datatables.net' {
 		searchBuilder?: ConfigSearchBuilderLanguage;
 	}
 
+	interface ConfigColumns {
+		searchBuilder?: {
+			/** Set a default condition for this column */
+			defaultCondition?: number | string;
+
+			/** Set values of orthogonal data for rendering functions */
+			orthogonal?: {[key: string]: string};
+		};
+
+		/** Set a custom title for a column in SearchBuilder */
+		searchBuilderTitle?: string;
+
+		/** Set the SearchBuilder type to use for a column */
+		searchBuilderType?: string;
+	}
+
 	interface Api<T> {
 		/**
 		 * SearchBuilder methods container