From 80f8f17cce240516bd8d49fca961b17c13216002 Mon Sep 17 00:00:00 2001 From: Julian Motz Date: Mon, 11 Jul 2016 10:54:47 +0200 Subject: [PATCH] Added datatables.mark.js v2.0.0 --- features/mark.js/datatables.mark.es6.js | 6 +++--- features/mark.js/datatables.mark.es6.min.js | 4 ++-- features/mark.js/datatables.mark.js | 6 +++--- features/mark.js/datatables.mark.min.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/features/mark.js/datatables.mark.es6.js b/features/mark.js/datatables.mark.es6.js index e6de541..c10a2b5 100644 --- a/features/mark.js/datatables.mark.es6.js +++ b/features/mark.js/datatables.mark.es6.js @@ -1,5 +1,5 @@ /*!*************************************************** - * datatables.mark.js v1.0.1 + * datatables.mark.js v2.0.0 * https://github.com/julmot/datatables.mark.js * Copyright (c) 2016, Julian Motz * Released under the MIT license https://git.io/voRZ7 @@ -9,11 +9,11 @@ ((factory, window, document) => { if (typeof define === "function" && define.amd) { - define(["jquery", "datatables", "markjs"], jQuery => { + define(["jquery", "datatables.net", "markjs"], jQuery => { return factory(window, document, jQuery); }); } else if (typeof exports === "object") { - require("datatables"); + require("datatables.net"); require("markjs"); factory(window, document, require("jquery")); } else { diff --git a/features/mark.js/datatables.mark.es6.min.js b/features/mark.js/datatables.mark.es6.min.js index 2fef0d1..dadd6fa 100644 --- a/features/mark.js/datatables.mark.es6.min.js +++ b/features/mark.js/datatables.mark.es6.min.js @@ -1,7 +1,7 @@ /*!*************************************************** - * datatables.mark.js v1.0.1 + * datatables.mark.js v2.0.0 * https://github.com/julmot/datatables.mark.js * Copyright (c) 2016, Julian Motz * Released under the MIT license https://git.io/voRZ7 *****************************************************/ -"use strict";((factory,window,document)=>{if(typeof define==="function"&&define.amd){define(["jquery","datatables","markjs"],jQuery=>{return factory(window,document,jQuery);});}else if(typeof exports==="object"){require("datatables");require("markjs");factory(window,document,require("jquery"));}else{factory(window,document,jQuery);}})((window,document,$)=>{class Mark_DataTables{constructor(dtInstance,options){if(typeof $.fn.mark!=="function"||typeof $.fn.unmark!=="function"){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 Mark_DataTables(dtInstance,options);});},window,document); +"use strict";((factory,window,document)=>{if(typeof define==="function"&&define.amd){define(["jquery","datatables.net","markjs"],jQuery=>{return factory(window,document,jQuery);});}else if(typeof exports==="object"){require("datatables.net");require("markjs");factory(window,document,require("jquery"));}else{factory(window,document,jQuery);}})((window,document,$)=>{class Mark_DataTables{constructor(dtInstance,options){if(typeof $.fn.mark!=="function"||typeof $.fn.unmark!=="function"){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 Mark_DataTables(dtInstance,options);});},window,document); diff --git a/features/mark.js/datatables.mark.js b/features/mark.js/datatables.mark.js index 925bf15..29ec0c0 100644 --- a/features/mark.js/datatables.mark.js +++ b/features/mark.js/datatables.mark.js @@ -1,5 +1,5 @@ /*!*************************************************** - * datatables.mark.js v1.0.1 + * datatables.mark.js v2.0.0 * https://github.com/julmot/datatables.mark.js * Copyright (c) 2016, Julian Motz * Released under the MIT license https://git.io/voRZ7 @@ -15,11 +15,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons (function (factory, window, document) { if (typeof define === "function" && define.amd) { - define(["jquery", "datatables", "markjs"], function (jQuery) { + define(["jquery", "datatables.net", "markjs"], function (jQuery) { return factory(window, document, jQuery); }); } else if ((typeof exports === "undefined" ? "undefined" : _typeof(exports)) === "object") { - require("datatables"); + require("datatables.net"); require("markjs"); factory(window, document, require("jquery")); } else { diff --git a/features/mark.js/datatables.mark.min.js b/features/mark.js/datatables.mark.min.js index d51918e..cf68e6f 100644 --- a/features/mark.js/datatables.mark.min.js +++ b/features/mark.js/datatables.mark.min.js @@ -1,7 +1,7 @@ /*!*************************************************** - * datatables.mark.js v1.0.1 + * datatables.mark.js v2.0.0 * https://github.com/julmot/datatables.mark.js * Copyright (c) 2016, Julian Motz * Released under the MIT license https://git.io/voRZ7 *****************************************************/ -"use strict";function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function a(a,b){for(var c=0;ca.intervalThreshold?(clearTimeout(c),c=setTimeout(function(){a.mark()},a.intervalMs)):a.mark()}),this.instance.on("destroy",function(){a.instance.off(b)}),this.mark()}},{key:"mark",value:function(){var a=this,b=this.instance.search();c(this.instance.table().body()).unmark(this.options),this.instance.columns({search:"applied",page:"current"}).nodes().each(function(d,e){var f=a.instance.column(e).search(),g=f||b;g&&d.forEach(function(b){c(b).mark(g,a.options)})})}}]),a}();c(b).on("init.dt.dth",function(a,b){if("dt"===a.namespace){var e=c.fn.dataTable.Api(b),f=null;e.init().mark?f=e.init().mark:c.fn.dataTable.defaults.mark&&(f=c.fn.dataTable.defaults.mark),null!==f&&new d(e,f)}})},window,document); \ No newline at end of file +"use strict";function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function a(a,b){for(var c=0;ca.intervalThreshold?(clearTimeout(c),c=setTimeout(function(){a.mark()},a.intervalMs)):a.mark()}),this.instance.on("destroy",function(){a.instance.off(b)}),this.mark()}},{key:"mark",value:function(){var a=this,b=this.instance.search();c(this.instance.table().body()).unmark(this.options),this.instance.columns({search:"applied",page:"current"}).nodes().each(function(d,e){var f=a.instance.column(e).search(),g=f||b;g&&d.forEach(function(b){c(b).mark(g,a.options)})})}}]),a}();c(b).on("init.dt.dth",function(a,b){if("dt"===a.namespace){var e=c.fn.dataTable.Api(b),f=null;e.init().mark?f=e.init().mark:c.fn.dataTable.defaults.mark&&(f=c.fn.dataTable.defaults.mark),null!==f&&new d(e,f)}})},window,document); \ No newline at end of file