Skip to content

Commit

Permalink
Merge pull request #276 from julmot/master
Browse files Browse the repository at this point in the history
Features: Update - datatables.mark.js v1.0.1
  • Loading branch information
Allan Jardine committed Jul 7, 2016
2 parents e6b4569 + 438423c commit 426ebfb
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 12 deletions.
24 changes: 20 additions & 4 deletions features/mark.js/datatables.mark.es6.js
@@ -1,5 +1,5 @@
/*!***************************************************
* datatables.mark.js v1.0.0
* datatables.mark.js v1.0.1
* https://github.com/julmot/datatables.mark.js
* Copyright (c) 2016, Julian Motz
* Released under the MIT license https://git.io/voRZ7
Expand Down Expand Up @@ -27,20 +27,36 @@
}
this.instance = dtInstance;
this.options = typeof options === "object" ? options : {};
this.intervalThreshold = 49;
this.intervalMs = 300;
this.initMarkListener();
}

initMarkListener() {
this.instance.on("draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth", this.mark.bind(this));
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("draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth");
this.instance.off(ev);
});
this.mark();
}

mark() {
const globalSearch = this.instance.search();

$(this.instance.table().body()).unmark(this.options);
this.instance.columns({
search: "applied",
Expand Down
4 changes: 2 additions & 2 deletions features/mark.js/datatables.mark.es6.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 20 additions & 4 deletions features/mark.js/datatables.mark.js
@@ -1,5 +1,5 @@
/*!***************************************************
* datatables.mark.js v1.0.0
* datatables.mark.js v1.0.1
* https://github.com/julmot/datatables.mark.js
* Copyright (c) 2016, Julian Motz
* Released under the MIT license https://git.io/voRZ7
Expand Down Expand Up @@ -35,6 +35,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
this.instance = dtInstance;
this.options = (typeof options === "undefined" ? "undefined" : _typeof(options)) === "object" ? options : {};
this.intervalThreshold = 49;
this.intervalMs = 300;
this.initMarkListener();
}

Expand All @@ -43,9 +45,24 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
value: function initMarkListener() {
var _this = this;

this.instance.on("draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth", this.mark.bind(this));
var ev = "draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth";
var intvl = null;
this.instance.on(ev, function () {
var rows = _this.instance.rows({
filter: "applied",
page: "current"
}).nodes().length;
if (rows > _this.intervalThreshold) {
clearTimeout(intvl);
intvl = setTimeout(function () {
_this.mark();
}, _this.intervalMs);
} else {
_this.mark();
}
});
this.instance.on("destroy", function () {
_this.instance.off("draw.dt.dth column-visibility.dt.dth column-reorder.dt.dth");
_this.instance.off(ev);
});
this.mark();
}
Expand All @@ -55,7 +72,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var _this2 = this;

var globalSearch = this.instance.search();

$(this.instance.table().body()).unmark(this.options);
this.instance.columns({
search: "applied",
Expand Down
4 changes: 2 additions & 2 deletions features/mark.js/datatables.mark.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 426ebfb

Please sign in to comment.