Merge pull request #501 from julmot/datatables.mark.js-2.1.0

Update datatables.mark.js
pull/503/head
Allan Jardine 4 years ago committed by GitHub
commit d313de6f5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,9 +1,9 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.1 * datatables.mark.js v2.1.0
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 20162017, Julian Motz * Copyright (c) 20162020, Julian Kühnel
* Released under the MIT license https://git.io/voRZ7 * Released under the MIT license https://git.io/voRZ7
*****************************************************/ *****************************************************/
'use strict'; 'use strict';
@ -34,7 +34,8 @@
} }
initMarkListener() { initMarkListener() {
const ev = 'draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth'; let ev = 'draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth';
ev += ' responsive-display.dt.dth';
let intvl = null; let intvl = null;
this.instance.on(ev, () => { this.instance.on(ev, () => {
const rows = this.instance.rows({ const rows = this.instance.rows({
@ -58,7 +59,11 @@
mark() { mark() {
const globalSearch = this.instance.search(); const globalSearch = this.instance.search();
$(this.instance.table().body()).unmark(this.options); const $tableBody = $(this.instance.table().body());
$tableBody.unmark(this.options);
if (this.instance.table().rows({ search: 'applied' }).data().length) {
$tableBody.mark(globalSearch, this.options);
}
this.instance.columns({ this.instance.columns({
search: 'applied', search: 'applied',
page: 'current' page: 'current'
@ -67,7 +72,7 @@
searchVal = columnSearch || globalSearch; searchVal = columnSearch || globalSearch;
if (searchVal) { if (searchVal) {
nodes.forEach(node => { nodes.forEach(node => {
$(node).mark(searchVal, this.options); $(node).unmark(this.options).mark(searchVal, this.options);
}); });
} }
}); });

@ -1,7 +1,7 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.1 * datatables.mark.js v2.1.0
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 20162017, Julian Motz * Copyright (c) 20162020, Julian Kühnel
* Released under the MIT license https://git.io/voRZ7 * Released under the MIT license https://git.io/voRZ7
*****************************************************/ *****************************************************/
'use strict';((factory,window,document)=>{if(typeof exports==='object'){const jquery=require('jquery');require('datatables.net');require('mark.js/dist/jquery.mark.js');module.exports=factory(window,document,jquery);}else if(typeof define==='function'&&define.amd){define(['jquery','datatables.net','markjs'],jQuery=>{return factory(window,document,jQuery);});}else{factory(window,document,jQuery);}})((window,document,$)=>{class MarkDataTables{constructor(dtInstance,options){if(!$.fn.mark||!$.fn.unmark){throw new Error('jquery.mark.js is necessary for datatables.mark.js');}this.instance=dtInstance;this.options=typeof options==='object'?options:{};this.intervalThreshold=49;this.intervalMs=300;this.initMarkListener();}initMarkListener(){const ev='draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth';let intvl=null;this.instance.on(ev,()=>{const rows=this.instance.rows({filter:'applied',page:'current'}).nodes().length;if(rows>this.intervalThreshold){clearTimeout(intvl);intvl=setTimeout(()=>{this.mark();},this.intervalMs);}else{this.mark();}});this.instance.on('destroy',()=>{this.instance.off(ev);});this.mark();}mark(){const globalSearch=this.instance.search();$(this.instance.table().body()).unmark(this.options);this.instance.columns({search:'applied',page:'current'}).nodes().each((nodes,colIndex)=>{const columnSearch=this.instance.column(colIndex).search(),searchVal=columnSearch||globalSearch;if(searchVal){nodes.forEach(node=>{$(node).mark(searchVal,this.options);});}});}}$(document).on('init.dt.dth',(event,settings)=>{if(event.namespace!=='dt'){return;}const dtInstance=$.fn.dataTable.Api(settings);let options=null;if(dtInstance.init().mark){options=dtInstance.init().mark;}else if($.fn.dataTable.defaults.mark){options=$.fn.dataTable.defaults.mark;}if(options===null){return;}new MarkDataTables(dtInstance,options);});},window,document); 'use strict';((factory,window,document)=>{if(typeof exports==='object'){const jquery=require('jquery');require('datatables.net');require('mark.js/dist/jquery.mark.js');module.exports=factory(window,document,jquery);}else if(typeof define==='function'&&define.amd){define(['jquery','datatables.net','markjs'],jQuery=>{return factory(window,document,jQuery);});}else{factory(window,document,jQuery);}})((window,document,$)=>{class MarkDataTables{constructor(dtInstance,options){if(!$.fn.mark||!$.fn.unmark){throw new Error('jquery.mark.js is necessary for datatables.mark.js');}this.instance=dtInstance;this.options=typeof options==='object'?options:{};this.intervalThreshold=49;this.intervalMs=300;this.initMarkListener();}initMarkListener(){let ev='draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth';ev+=' responsive-display.dt.dth';let intvl=null;this.instance.on(ev,()=>{const rows=this.instance.rows({filter:'applied',page:'current'}).nodes().length;if(rows>this.intervalThreshold){clearTimeout(intvl);intvl=setTimeout(()=>{this.mark();},this.intervalMs);}else{this.mark();}});this.instance.on('destroy',()=>{this.instance.off(ev);});this.mark();}mark(){const globalSearch=this.instance.search();const $tableBody=$(this.instance.table().body());$tableBody.unmark(this.options);if(this.instance.table().rows({search:'applied'}).data().length){$tableBody.mark(globalSearch,this.options);}this.instance.columns({search:'applied',page:'current'}).nodes().each((nodes,colIndex)=>{const columnSearch=this.instance.column(colIndex).search(),searchVal=columnSearch||globalSearch;if(searchVal){nodes.forEach(node=>{$(node).unmark(this.options).mark(searchVal,this.options);});}});}}$(document).on('init.dt.dth',(event,settings)=>{if(event.namespace!=='dt'){return;}const dtInstance=$.fn.dataTable.Api(settings);let options=null;if(dtInstance.init().mark){options=dtInstance.init().mark;}else if($.fn.dataTable.defaults.mark){options=$.fn.dataTable.defaults.mark;}if(options===null){return;}new MarkDataTables(dtInstance,options);});},window,document);

@ -1,9 +1,9 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.1 * datatables.mark.js v2.1.0
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 20162017, Julian Motz * Copyright (c) 20162020, Julian Kühnel
* Released under the MIT license https://git.io/voRZ7 * Released under the MIT license https://git.io/voRZ7
*****************************************************/ *****************************************************/
'use strict'; 'use strict';
@ -47,6 +47,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var _this = this; var _this = this;
var ev = 'draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth'; var ev = 'draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth';
ev += ' responsive-display.dt.dth';
var intvl = null; var intvl = null;
this.instance.on(ev, function () { this.instance.on(ev, function () {
var rows = _this.instance.rows({ var rows = _this.instance.rows({
@ -73,7 +74,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var _this2 = this; var _this2 = this;
var globalSearch = this.instance.search(); var globalSearch = this.instance.search();
$(this.instance.table().body()).unmark(this.options); var $tableBody = $(this.instance.table().body());
$tableBody.unmark(this.options);
if (this.instance.table().rows({ search: 'applied' }).data().length) {
$tableBody.mark(globalSearch, this.options);
}
this.instance.columns({ this.instance.columns({
search: 'applied', search: 'applied',
page: 'current' page: 'current'
@ -82,7 +87,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
searchVal = columnSearch || globalSearch; searchVal = columnSearch || globalSearch;
if (searchVal) { if (searchVal) {
nodes.forEach(function (node) { nodes.forEach(function (node) {
$(node).mark(searchVal, _this2.options); $(node).unmark(_this2.options).mark(searchVal, _this2.options);
}); });
} }
}); });

@ -1,7 +1,7 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.1 * datatables.mark.js v2.1.0
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 20162017, Julian Motz * Copyright (c) 20162020, Julian Kühnel
* Released under the MIT license https://git.io/voRZ7 * Released under the MIT license https://git.io/voRZ7
*****************************************************/ *****************************************************/
"use strict";function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,n,r){return n&&e(t.prototype,n),r&&e(t,r),t}}(),_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};!function(e,t,n){if("object"===("undefined"==typeof exports?"undefined":_typeof(exports))){var r=require("jquery");require("datatables.net"),require("mark.js/dist/jquery.mark.js"),module.exports=e(t,n,r)}else"function"==typeof define&&define.amd?define(["jquery","datatables.net","markjs"],function(r){return e(t,n,r)}):e(t,n,jQuery)}(function(e,t,n){var r=function(){function e(t,r){if(_classCallCheck(this,e),!n.fn.mark||!n.fn.unmark)throw new Error("jquery.mark.js is necessary for datatables.mark.js");this.instance=t,this.options="object"===(void 0===r?"undefined":_typeof(r))?r:{},this.intervalThreshold=49,this.intervalMs=300,this.initMarkListener()}return _createClass(e,[{key:"initMarkListener",value:function(){var e=this,t="draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth",n=null;this.instance.on(t,function(){e.instance.rows({filter:"applied",page:"current"}).nodes().length>e.intervalThreshold?(clearTimeout(n),n=setTimeout(function(){e.mark()},e.intervalMs)):e.mark()}),this.instance.on("destroy",function(){e.instance.off(t)}),this.mark()}},{key:"mark",value:function(){var e=this,t=this.instance.search();n(this.instance.table().body()).unmark(this.options),this.instance.columns({search:"applied",page:"current"}).nodes().each(function(r,a){var i=e.instance.column(a).search()||t;i&&r.forEach(function(t){n(t).mark(i,e.options)})})}}]),e}();n(t).on("init.dt.dth",function(e,t){if("dt"===e.namespace){var a=n.fn.dataTable.Api(t),i=null;a.init().mark?i=a.init().mark:n.fn.dataTable.defaults.mark&&(i=n.fn.dataTable.defaults.mark),null!==i&&new r(a,i)}})},window,document); "use strict";var _createClass=function(){function a(t,e){for(var n=0;n<e.length;n++){var a=e[n];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a)}}return function(t,e,n){return e&&a(t.prototype,e),n&&a(t,n),t}}(),_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t};function _classCallCheck(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}!function(e,t,n){var a;"object"===("undefined"==typeof exports?"undefined":_typeof(exports))?(a=require("jquery"),require("datatables.net"),require("mark.js/dist/jquery.mark.js"),module.exports=e(0,n,a)):"function"==typeof define&&define.amd?define(["jquery","datatables.net","markjs"],function(t){return e(0,n,t)}):e(0,n,jQuery)}(function(t,e,i){var r=(_createClass(n,[{key:"initMarkListener",value:function(){var t=this,e="draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth";e+=" responsive-display.dt.dth";var n=null;this.instance.on(e,function(){t.instance.rows({filter:"applied",page:"current"}).nodes().length>t.intervalThreshold?(clearTimeout(n),n=setTimeout(function(){t.mark()},t.intervalMs)):t.mark()}),this.instance.on("destroy",function(){t.instance.off(e)}),this.mark()}},{key:"mark",value:function(){var a=this,r=this.instance.search(),t=i(this.instance.table().body());t.unmark(this.options),this.instance.table().rows({search:"applied"}).data().length&&t.mark(r,this.options),this.instance.columns({search:"applied",page:"current"}).nodes().each(function(t,e){var n=a.instance.column(e).search()||r;n&&t.forEach(function(t){i(t).unmark(a.options).mark(n,a.options)})})}}]),n);function n(t,e){if(_classCallCheck(this,n),!i.fn.mark||!i.fn.unmark)throw new Error("jquery.mark.js is necessary for datatables.mark.js");this.instance=t,this.options="object"===(void 0===e?"undefined":_typeof(e))?e:{},this.intervalThreshold=49,this.intervalMs=300,this.initMarkListener()}i(e).on("init.dt.dth",function(t,e){var n,a;"dt"===t.namespace&&(a=null,(n=i.fn.dataTable.Api(e)).init().mark?a=n.init().mark:i.fn.dataTable.defaults.mark&&(a=i.fn.dataTable.defaults.mark),null!==a&&new r(n,a))})},window,document);
Loading…
Cancel
Save