diff --git a/datatables.json b/datatables.json index 15ef75e..b446bdc 100644 --- a/datatables.json +++ b/datatables.json @@ -15,5 +15,5 @@ ], "src-repo": "http://github.com/DataTables/SearchBuilder", "last-tag": "1.4.0", - "last-sync": "de6f8c99ee28cc8514572b5897e3de2006f2e65f" + "last-sync": "fc0e19d74da50f4629cc620fddf993a94622d4cd" } \ No newline at end of file diff --git a/js/searchBuilder.jqueryui.js b/js/searchBuilder.jqueryui.js index 253f94e..1631226 100644 --- a/js/searchBuilder.jqueryui.js +++ b/js/searchBuilder.jqueryui.js @@ -11,19 +11,8 @@ } 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-jqui')(root, $); } @@ -31,9 +20,28 @@ if ( ! $.fn.dataTable.SearchBuilder ) { require('datatables.net-searchbuilder')(root, $); } - - return factory( $, root, root.document ); }; + + 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; + } + + if ( ! $ ) { + $ = jq( root ); + } + + cjsRequires( root, $ ); + return factory( $, root, root.document ); + }; + } + else { + cjsRequires( window, jq ); + module.exports = factory( jq, window, window.document ); + } } else { // Browser diff --git a/js/searchBuilder.jqueryui.min.js b/js/searchBuilder.jqueryui.min.js index ed21d33..7c363a2 100644 --- a/js/searchBuilder.jqueryui.min.js +++ b/js/searchBuilder.jqueryui.min.js @@ -1,4 +1,4 @@ /*! JQuery ui ui integration for DataTables' SearchBuilder * © SpryMedia Ltd - datatables.net/license */ -!function(u){"function"==typeof define&&define.amd?define(["jquery","datatables.net-jqui","datatables.net-searchbuilder"],function(e){return u(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-jqui")(e,t),t.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(e,t),u(t,0,e.document)}:u(jQuery,window,document)}(function(e,t,u,i){"use strict";var n=e.fn.dataTable;return e.extend(!0,n.SearchBuilder.classes,{clearAll:"ui-button ui-corner-all ui-widget dtsb-clearAll"}),e.extend(!0,n.Group.classes,{add:"ui-button ui-corner-all ui-widget dtsb-add",clearGroup:"ui-button ui-corner-all ui-widget dtsb-clearGroup",logic:"ui-button ui-corner-all ui-widget dtsb-logic"}),e.extend(!0,n.Criteria.classes,{condition:"ui-selectmenu-button ui-button ui-widget ui-selectmenu-button-closed ui-corner-all dtsb-condition",data:"ui-selectmenu-button ui-button ui-widget ui-selectmenu-button-closed ui-corner-all dtsb-data",delete:"ui-button ui-corner-all ui-widget dtsb-delete",left:"ui-button ui-corner-all ui-widget dtsb-left",right:"ui-button ui-corner-all ui-widget dtsb-right",value:"ui-selectmenu-button ui-button ui-widget ui-selectmenu-button-closed ui-corner-all dtsb-value"}),n}); \ No newline at end of file +!function(u){var i,n;"function"==typeof define&&define.amd?define(["jquery","datatables.net-jqui","datatables.net-searchbuilder"],function(e){return u(e,window,document)}):"object"==typeof exports?(i=require("jquery"),n=function(e,t){t.fn.dataTable||require("datatables.net-jqui")(e,t),t.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(e,t)},"undefined"!=typeof window?module.exports=function(e,t){return e=e||window,t=t||i(e),n(e,t),u(t,0,e.document)}:(n(window,i),module.exports=u(i,window,window.document))):u(jQuery,window,document)}(function(e,t,u,i){"use strict";var n=e.fn.dataTable;return e.extend(!0,n.SearchBuilder.classes,{clearAll:"ui-button ui-corner-all ui-widget dtsb-clearAll"}),e.extend(!0,n.Group.classes,{add:"ui-button ui-corner-all ui-widget dtsb-add",clearGroup:"ui-button ui-corner-all ui-widget dtsb-clearGroup",logic:"ui-button ui-corner-all ui-widget dtsb-logic"}),e.extend(!0,n.Criteria.classes,{condition:"ui-selectmenu-button ui-button ui-widget ui-selectmenu-button-closed ui-corner-all dtsb-condition",data:"ui-selectmenu-button ui-button ui-widget ui-selectmenu-button-closed ui-corner-all dtsb-data",delete:"ui-button ui-corner-all ui-widget dtsb-delete",left:"ui-button ui-corner-all ui-widget dtsb-left",right:"ui-button ui-corner-all ui-widget dtsb-right",value:"ui-selectmenu-button ui-button ui-widget ui-selectmenu-button-closed ui-corner-all dtsb-value"}),n}); \ No newline at end of file diff --git a/js/searchBuilder.jqueryui.mjs b/js/searchBuilder.jqueryui.mjs index c40b3ae..e70a159 100644 --- a/js/searchBuilder.jqueryui.mjs +++ b/js/searchBuilder.jqueryui.mjs @@ -6,7 +6,6 @@ import $ from 'jquery'; import DataTable from 'datatables.net-jqui'; import SearchBuilder from 'datatables.net-searchbuilder'; - $.extend(true, DataTable.SearchBuilder.classes, { clearAll: 'ui-button ui-corner-all ui-widget dtsb-clearAll' });