Merge branch 'master' of github.com:DataTables/Plugins

pull/348/head
Allan Jardine 7 years ago
commit a0ebc4219e

@ -1,44 +1,45 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.0 * datatables.mark.js v2.0.1
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 2016, Julian Motz * Copyright (c) 20162017, Julian Motz
* Released under the MIT license https://git.io/voRZ7 * Released under the MIT license https://git.io/voRZ7
*****************************************************/ *****************************************************/
"use strict"; 'use strict';
((factory, window, document) => { ((factory, window, document) => {
if (typeof define === "function" && define.amd) { if (typeof exports === 'object') {
define(["jquery", "datatables.net", "markjs"], jQuery => { 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); return factory(window, document, jQuery);
}); });
} else if (typeof exports === "object") {
require("datatables.net");
require("markjs");
factory(window, document, require("jquery"));
} else { } else {
factory(window, document, jQuery); factory(window, document, jQuery);
} }
})((window, document, $) => { })((window, document, $) => {
class Mark_DataTables { class MarkDataTables {
constructor(dtInstance, options) { constructor(dtInstance, options) {
if (typeof $.fn.mark !== "function" || typeof $.fn.unmark !== "function") { if (!$.fn.mark || !$.fn.unmark) {
throw new Error("jquery.mark.js is necessary for datatables.mark.js"); throw new Error('jquery.mark.js is necessary for datatables.mark.js');
} }
this.instance = dtInstance; this.instance = dtInstance;
this.options = typeof options === "object" ? options : {}; this.options = typeof options === 'object' ? options : {};
this.intervalThreshold = 49; this.intervalThreshold = 49;
this.intervalMs = 300; this.intervalMs = 300;
this.initMarkListener(); this.initMarkListener();
} }
initMarkListener() { initMarkListener() {
const ev = "draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth"; const ev = 'draw.dt.dth column-visibility.dt.dth column-reorder.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({
filter: "applied", filter: 'applied',
page: "current" page: 'current'
}).nodes().length; }).nodes().length;
if (rows > this.intervalThreshold) { if (rows > this.intervalThreshold) {
clearTimeout(intvl); clearTimeout(intvl);
@ -49,7 +50,7 @@
this.mark(); this.mark();
} }
}); });
this.instance.on("destroy", () => { this.instance.on('destroy', () => {
this.instance.off(ev); this.instance.off(ev);
}); });
this.mark(); this.mark();
@ -59,8 +60,8 @@
const globalSearch = this.instance.search(); const globalSearch = this.instance.search();
$(this.instance.table().body()).unmark(this.options); $(this.instance.table().body()).unmark(this.options);
this.instance.columns({ this.instance.columns({
search: "applied", search: 'applied',
page: "current" page: 'current'
}).nodes().each((nodes, colIndex) => { }).nodes().each((nodes, colIndex) => {
const columnSearch = this.instance.column(colIndex).search(), const columnSearch = this.instance.column(colIndex).search(),
searchVal = columnSearch || globalSearch; searchVal = columnSearch || globalSearch;
@ -74,8 +75,8 @@
} }
$(document).on("init.dt.dth", (event, settings) => { $(document).on('init.dt.dth', (event, settings) => {
if (event.namespace !== "dt") { if (event.namespace !== 'dt') {
return; return;
} }
@ -91,6 +92,6 @@
return; return;
} }
new Mark_DataTables(dtInstance, options); new MarkDataTables(dtInstance, options);
}); });
}, window, document); }, window, document);

@ -1,7 +1,7 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.0 * datatables.mark.js v2.0.1
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 2016, Julian Motz * Copyright (c) 20162017, Julian Motz
* 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 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); '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);

@ -1,56 +1,57 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.0 * datatables.mark.js v2.0.1
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 2016, Julian Motz * Copyright (c) 20162017, Julian Motz
* Released under the MIT license https://git.io/voRZ7 * Released under the MIT license https://git.io/voRZ7
*****************************************************/ *****************************************************/
"use strict"; 'use strict';
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol ? "symbol" : typeof obj; }; var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
(function (factory, window, document) { (function (factory, window, document) {
if (typeof define === "function" && define.amd) { if ((typeof exports === 'undefined' ? 'undefined' : _typeof(exports)) === 'object') {
define(["jquery", "datatables.net", "markjs"], function (jQuery) { var 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'], function (jQuery) {
return factory(window, document, jQuery); return factory(window, document, jQuery);
}); });
} else if ((typeof exports === "undefined" ? "undefined" : _typeof(exports)) === "object") {
require("datatables.net");
require("markjs");
factory(window, document, require("jquery"));
} else { } else {
factory(window, document, jQuery); factory(window, document, jQuery);
} }
})(function (window, document, $) { })(function (window, document, $) {
var Mark_DataTables = function () { var MarkDataTables = function () {
function Mark_DataTables(dtInstance, options) { function MarkDataTables(dtInstance, options) {
_classCallCheck(this, Mark_DataTables); _classCallCheck(this, MarkDataTables);
if (typeof $.fn.mark !== "function" || typeof $.fn.unmark !== "function") { if (!$.fn.mark || !$.fn.unmark) {
throw new Error("jquery.mark.js is necessary for datatables.mark.js"); throw new Error('jquery.mark.js is necessary for datatables.mark.js');
} }
this.instance = dtInstance; this.instance = dtInstance;
this.options = (typeof options === "undefined" ? "undefined" : _typeof(options)) === "object" ? options : {}; this.options = (typeof options === 'undefined' ? 'undefined' : _typeof(options)) === 'object' ? options : {};
this.intervalThreshold = 49; this.intervalThreshold = 49;
this.intervalMs = 300; this.intervalMs = 300;
this.initMarkListener(); this.initMarkListener();
} }
_createClass(Mark_DataTables, [{ _createClass(MarkDataTables, [{
key: "initMarkListener", key: 'initMarkListener',
value: function initMarkListener() { value: function initMarkListener() {
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';
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({
filter: "applied", filter: 'applied',
page: "current" page: 'current'
}).nodes().length; }).nodes().length;
if (rows > _this.intervalThreshold) { if (rows > _this.intervalThreshold) {
clearTimeout(intvl); clearTimeout(intvl);
@ -61,21 +62,21 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
_this.mark(); _this.mark();
} }
}); });
this.instance.on("destroy", function () { this.instance.on('destroy', function () {
_this.instance.off(ev); _this.instance.off(ev);
}); });
this.mark(); this.mark();
} }
}, { }, {
key: "mark", key: 'mark',
value: function mark() { value: function mark() {
var _this2 = this; var _this2 = this;
var globalSearch = this.instance.search(); var globalSearch = this.instance.search();
$(this.instance.table().body()).unmark(this.options); $(this.instance.table().body()).unmark(this.options);
this.instance.columns({ this.instance.columns({
search: "applied", search: 'applied',
page: "current" page: 'current'
}).nodes().each(function (nodes, colIndex) { }).nodes().each(function (nodes, colIndex) {
var columnSearch = _this2.instance.column(colIndex).search(), var columnSearch = _this2.instance.column(colIndex).search(),
searchVal = columnSearch || globalSearch; searchVal = columnSearch || globalSearch;
@ -88,11 +89,11 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
} }
}]); }]);
return Mark_DataTables; return MarkDataTables;
}(); }();
$(document).on("init.dt.dth", function (event, settings) { $(document).on('init.dt.dth', function (event, settings) {
if (event.namespace !== "dt") { if (event.namespace !== 'dt') {
return; return;
} }
@ -108,6 +109,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return; return;
} }
new Mark_DataTables(dtInstance, options); new MarkDataTables(dtInstance, options);
}); });
}, window, document); }, window, document);

@ -1,7 +1,7 @@
/*!*************************************************** /*!***************************************************
* datatables.mark.js v2.0.0 * datatables.mark.js v2.0.1
* https://github.com/julmot/datatables.mark.js * https://github.com/julmot/datatables.mark.js
* Copyright (c) 2016, Julian Motz * Copyright (c) 20162017, Julian Motz
* Released under the MIT license https://git.io/voRZ7 * 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;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(a){return typeof a}:function(a){return a&&"function"==typeof Symbol&&a.constructor===Symbol?"symbol":typeof a};!function(a,b,c){"function"==typeof define&&define.amd?define(["jquery","datatables.net","markjs"],function(d){return a(b,c,d)}):"object"===("undefined"==typeof exports?"undefined":_typeof(exports))?(require("datatables.net"),require("markjs"),a(b,c,require("jquery"))):a(b,c,jQuery)}(function(a,b,c){var d=function(){function a(b,d){if(_classCallCheck(this,a),"function"!=typeof c.fn.mark||"function"!=typeof c.fn.unmark)throw new Error("jquery.mark.js is necessary for datatables.mark.js");this.instance=b,this.options="object"===("undefined"==typeof d?"undefined":_typeof(d))?d:{},this.intervalThreshold=49,this.intervalMs=300,this.initMarkListener()}return _createClass(a,[{key:"initMarkListener",value:function(){var a=this,b="draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth",c=null;this.instance.on(b,function(){var b=a.instance.rows({filter:"applied",page:"current"}).nodes().length;b>a.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); "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);
Loading…
Cancel
Save