From 81d7a529ff180219e592869ed11090127700429f Mon Sep 17 00:00:00 2001 From: Max Guglielmi Date: Thu, 27 Oct 2016 13:33:42 +1100 Subject: [PATCH] Stored events list into const in Loader class --- package.json | 12 ++++----- src/modules/loader.js | 57 +++++++++++++------------------------------ 2 files changed, 23 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index d4305949..f60b16c7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tablefilter", - "version": "0.4.0", + "version": "0.4.1", "description": "A Javascript library making HTML tables filterable and a bit more", "license": "MIT", "author": { @@ -28,11 +28,11 @@ "tag": "next" }, "devDependencies": { - "babel-core": "^6.17.0", + "babel-core": "^6.18.0", "babel-eslint": "7.1.0", - "babel-loader": "^6.2.5", - "babel-plugin-transform-es2015-classes": "^6.14.0", - "babel-preset-es2015": "^6.16.0", + "babel-loader": "^6.2.6", + "babel-plugin-transform-es2015-classes": "^6.18.0", + "babel-preset-es2015": "^6.18.0", "clean-webpack-plugin": "^0.1.13", "diacritics": "1.2.3", "grunt": "^1.0.1", @@ -51,7 +51,7 @@ "script-loader": "^0.7.0", "string-replace-webpack-plugin": "^0.0.4", "sugar-date": "2.0.0", - "webpack": "^1.13.2", + "webpack": "^1.13.3", "webpack-dev-server": "^1.16.2" }, "dependencies": {}, diff --git a/src/modules/loader.js b/src/modules/loader.js index 4906e695..82539003 100644 --- a/src/modules/loader.js +++ b/src/modules/loader.js @@ -4,6 +4,19 @@ import {isFn} from '../types'; import {root} from '../root'; import {NONE} from '../const'; + +const EVENTS = [ + 'before-filtering', + 'before-populating-filter', + 'before-page-change', + 'before-clearing-filters', + 'before-page-length-change', + 'before-reset-page', + 'before-reset-page-length', + 'before-loading-extensions', + 'before-loading-themes' +]; + /** * Activity indicator * @@ -110,28 +123,10 @@ export class Loader extends Feature { this.show(NONE); // Subscribe to events - emitter.on([ - 'before-filtering', - 'before-populating-filter', - 'before-page-change', - 'before-clearing-filters', - 'before-page-length-change', - 'before-reset-page', - 'before-reset-page-length', - 'before-loading-extensions', - 'before-loading-themes'], + emitter.on(EVENTS, () => this.show('') ); - emitter.on([ - 'after-filtering', - 'after-populating-filter', - 'after-page-change', - 'after-clearing-filters', - 'after-page-length-change', - 'after-reset-page', - 'after-reset-page-length', - 'after-loading-extensions', - 'after-loading-themes'], + emitter.on(EVENTS, () => this.show(NONE) ); @@ -181,28 +176,10 @@ export class Loader extends Feature { this.cont = null; // Unsubscribe to events - emitter.off([ - 'before-filtering', - 'before-populating-filter', - 'before-page-change', - 'before-clearing-filters', - 'before-page-length-change', - 'before-reset-page', - 'before-reset-page-length', - 'before-loading-extensions', - 'before-loading-themes'], + emitter.off(EVENTS, () => this.show('') ); - emitter.off([ - 'after-filtering', - 'after-populating-filter', - 'after-page-change', - 'after-clearing-filters', - 'after-page-length-change', - 'after-reset-page', - 'after-reset-page-length', - 'after-loading-extensions', - 'after-loading-themes'], + emitter.off(EVENTS, () => this.show(NONE) );