1
0
Fork 0
mirror of https://github.com/koalyptus/TableFilter.git synced 2024-05-16 21:36:41 +02:00

fix extesion registering

This commit is contained in:
koalyptus 2019-02-15 14:16:35 +11:00
parent 34c56e5765
commit 8b1d3a6e23
4 changed files with 49 additions and 30 deletions

View file

@ -102,7 +102,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "tf-" + ({}[chunkId]||chunkId) + "-" + {"0":"d95430c357ebd060de71"}[chunkId] + ".js"; /******/ script.src = __webpack_require__.p + "tf-" + ({}[chunkId]||chunkId) + "-" + {"0":"b3e31eacd257cbab2460"}[chunkId] + ".js";
/******/ var timeout = setTimeout(function(){ /******/ var timeout = setTimeout(function(){
/******/ onScriptComplete({ type: 'timeout', target: script }); /******/ onScriptComplete({ type: 'timeout', target: script });
/******/ }, 120000); /******/ }, 120000);
@ -16325,8 +16325,7 @@ function bound(fn, scope) {
"use strict"; "use strict";
__webpack_require__.r(__webpack_exports__); __webpack_require__.r(__webpack_exports__);
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Feature", function() { return Feature; }); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "Feature", function() { return Feature; });
/* harmony import */ var _settings__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./settings */ "./src/settings.js"); /* harmony import */ var _string__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./string */ "./src/string.js");
/* harmony import */ var _string__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./string */ "./src/string.js");
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 _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); } } 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); } }
@ -16334,7 +16333,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
var NOT_IMPLEMENTED = 'Not implemented.'; var NOT_IMPLEMENTED = 'Not implemented.';
/** /**
* Base class defining the interface of a TableFilter feature * Base class defining the interface of a TableFilter feature
@ -16366,7 +16364,10 @@ function () {
* @type {String} * @type {String}
*/ */
this.feature = Object(_string__WEBPACK_IMPORTED_MODULE_1__["toCamelCase"])(cls.name); this.feature = cls.meta.altName || cls.meta.name || Object(_string__WEBPACK_IMPORTED_MODULE_0__["toCamelCase"])(cls.name);
console.log(cls.meta.altName, cls.meta.name, Object(_string__WEBPACK_IMPORTED_MODULE_0__["toCamelCase"])(cls.name), this.feature);
/**/
/** /**
* TableFilter feature setting * TableFilter feature setting
* @type {Boolean} * @type {Boolean}
@ -16391,8 +16392,8 @@ function () {
*/ */
this.initialized = false; // store resolved feature name this.initialized = false; // store resolved feature name
//cls.meta.name = this.feature;
cls.meta.name = this.feature;
/** Subscribe to destroy event */ /** Subscribe to destroy event */
this.emitter.on(['destroy'], function () { this.emitter.on(['destroy'], function () {
@ -24026,6 +24027,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
var doc = _root__WEBPACK_IMPORTED_MODULE_6__["root"].document; var doc = _root__WEBPACK_IMPORTED_MODULE_6__["root"].document;
var FEATURES = [_modules_dateType__WEBPACK_IMPORTED_MODULE_10__["DateType"], _modules_help__WEBPACK_IMPORTED_MODULE_11__["Help"], _modules_state__WEBPACK_IMPORTED_MODULE_12__["State"], _modules_markActiveColumns__WEBPACK_IMPORTED_MODULE_17__["MarkActiveColumns"], _modules_gridLayout__WEBPACK_IMPORTED_MODULE_13__["GridLayout"], _modules_loader__WEBPACK_IMPORTED_MODULE_14__["Loader"], _modules_highlightKeywords__WEBPACK_IMPORTED_MODULE_15__["HighlightKeyword"], _modules_popupFilter__WEBPACK_IMPORTED_MODULE_16__["PopupFilter"], _modules_rowsCounter__WEBPACK_IMPORTED_MODULE_18__["RowsCounter"], _modules_statusBar__WEBPACK_IMPORTED_MODULE_19__["StatusBar"], _modules_clearButton__WEBPACK_IMPORTED_MODULE_20__["ClearButton"], _modules_alternateRows__WEBPACK_IMPORTED_MODULE_21__["AlternateRows"], _modules_noResults__WEBPACK_IMPORTED_MODULE_22__["NoResults"], _modules_paging__WEBPACK_IMPORTED_MODULE_23__["Paging"], _modules_toolbar__WEBPACK_IMPORTED_MODULE_24__["Toolbar"]];
/** /**
* Makes HTML tables filterable and a bit more :) * Makes HTML tables filterable and a bit more :)
* *
@ -24922,7 +24924,7 @@ function () {
this.ExtRegistry = {}; // instantiate toolbar ui component as other components depend on it this.ExtRegistry = {}; // instantiate toolbar ui component as other components depend on it
this.instantiateFeatures([_modules_toolbar__WEBPACK_IMPORTED_MODULE_24__["Toolbar"]]); this.instantiateFeatures(FEATURES);
} }
/** /**
* Initialise features and layout * Initialise features and layout
@ -25257,15 +25259,21 @@ function () {
var features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; var features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
features.forEach(function (featureCls) { features.forEach(function (featureCls) {
var Cls = featureCls; var Cls = featureCls; // assign meta info if not present
var inst = new Cls(_this5);
var meta = Cls.meta;
var name = meta.name,
altName = meta.altName;
console.log(name, altName);
if (!_this5.hasConfig || _this5[altName || name] === true || Boolean(meta.alwaysInstantiate)) { Cls.meta = Cls.meta || {
_this5.Mod[name] = _this5.Mod[name] || inst; name: null,
altName: null
};
Cls.meta.name = Object(_string__WEBPACK_IMPORTED_MODULE_2__["toCamelCase"])(Cls.name);
var _Cls$meta = Cls.meta,
name = _Cls$meta.name,
altName = _Cls$meta.altName,
alwaysInstantiate = _Cls$meta.alwaysInstantiate;
var prop = altName || name; //console.log(name, altName, alwaysInstantiate);
if (!_this5.hasConfig || _this5[prop] === true || Boolean(alwaysInstantiate)) {
_this5.Mod[name] = _this5.Mod[name] || new Cls(_this5);
} }
}); });
} }
@ -25282,8 +25290,7 @@ function () {
var features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : []; var features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
features.forEach(function (featureCls) { features.forEach(function (featureCls) {
_this6.instantiateFeatures([featureCls]); // this.instantiateFeatures([featureCls]);
var name = featureCls.meta.name; var name = featureCls.meta.name;
if (_this6[name] === true && _this6.Mod[name]) { if (_this6[name] === true && _this6.Mod[name]) {

File diff suppressed because one or more lines are too long

View file

@ -1,4 +1,3 @@
import {defaultsStr} from './settings';
import {toCamelCase} from './string'; import {toCamelCase} from './string';
const NOT_IMPLEMENTED = 'Not implemented.'; const NOT_IMPLEMENTED = 'Not implemented.';
@ -26,7 +25,11 @@ export class Feature {
* convention * convention
* @type {String} * @type {String}
*/ */
this.feature = toCamelCase(cls.name); this.feature = cls.meta.altName || cls.meta.name
|| toCamelCase(cls.name);
console.log(cls.meta.altName, cls.meta.name, toCamelCase(cls.name),
this.feature);
/**/
/** /**
* TableFilter feature setting * TableFilter feature setting
@ -53,7 +56,7 @@ export class Feature {
this.initialized = false; this.initialized = false;
// store resolved feature name // store resolved feature name
cls.meta.name = this.feature; //cls.meta.name = this.feature;
/** Subscribe to destroy event */ /** Subscribe to destroy event */
this.emitter.on(['destroy'], () => this.destroy()); this.emitter.on(['destroy'], () => this.destroy());

View file

@ -2,7 +2,7 @@ import {addEvt, cancelEvt, stopEvt, targetEvt, isKeyPressed} from './event';
import { import {
addClass, createElm, elm, getText, getFirstTextNode, removeClass, tag addClass, createElm, elm, getText, getFirstTextNode, removeClass, tag
} from './dom'; } from './dom';
import {contains, matchCase, rgxEsc, trim} from './string'; import {contains, matchCase, rgxEsc, trim, toCamelCase} from './string';
import { import {
isArray, isEmpty, isFn, isNumber, isObj, isString, isUndef, EMPTY_FN, isArray, isEmpty, isFn, isNumber, isObj, isString, isUndef, EMPTY_FN,
isBoolean isBoolean
@ -41,6 +41,12 @@ import {
let doc = root.document; let doc = root.document;
const FEATURES = [
DateType, Help, State, MarkActiveColumns, GridLayout, Loader,
HighlightKeyword, PopupFilter, RowsCounter, StatusBar, ClearButton,
AlternateRows, NoResults, Paging, Toolbar
];
/** /**
* Makes HTML tables filterable and a bit more :) * Makes HTML tables filterable and a bit more :)
* *
@ -941,7 +947,7 @@ export class TableFilter {
this.ExtRegistry = {}; this.ExtRegistry = {};
// instantiate toolbar ui component as other components depend on it // instantiate toolbar ui component as other components depend on it
this.instantiateFeatures([Toolbar]); this.instantiateFeatures(FEATURES);
} }
/** /**
@ -1268,14 +1274,17 @@ export class TableFilter {
instantiateFeatures(features = []) { instantiateFeatures(features = []) {
features.forEach(featureCls => { features.forEach(featureCls => {
let Cls = featureCls; let Cls = featureCls;
let inst = new Cls(this);
let {meta} = Cls; // assign meta info if not present
let {name, altName} = meta; console.log(name, altName); Cls.meta = Cls.meta || {name: null, altName: null};
Cls.meta.name = toCamelCase(Cls.name);
let {name, altName, alwaysInstantiate} = Cls.meta;
let prop = altName || name;
//console.log(name, altName, alwaysInstantiate);
if (!this.hasConfig || this[altName || name] === true if (!this.hasConfig || this[prop] === true
|| Boolean(meta.alwaysInstantiate)) { || Boolean(alwaysInstantiate)) {
this.Mod[name] = this.Mod[name] || inst; this.Mod[name] = this.Mod[name] || new Cls(this);
} }
}); });
} }
@ -1287,7 +1296,7 @@ export class TableFilter {
*/ */
initFeatures(features = []) { initFeatures(features = []) {
features.forEach(featureCls => { features.forEach(featureCls => {
this.instantiateFeatures([featureCls]); // this.instantiateFeatures([featureCls]);
let {name} = featureCls.meta; let {name} = featureCls.meta;