Skip to content
Snippets Groups Projects
Commit 0802aa3f authored by Giannis Kopanas's avatar Giannis Kopanas
Browse files

fix(services): ordering of dependent services

parent 70782c68
No related branches found
No related tags found
1 merge request!48Develop
......@@ -19,6 +19,7 @@ export default class Application {
registerServices() {
let count = 0;
while (count < this.config.get("services").length) {
const allServices = this.config.get("services");
const service = this.config.get("services")[count];
/*
set App to every service
......@@ -27,7 +28,8 @@ export default class Application {
service.setApp(this);
if (service.dependencies) {
this.config.pushToArray("services", service.dependencies);
let servicePos = count;
allServices.splice(servicePos + 1, 0, ...service.dependencies);
}
if (service.register) {
......
......@@ -2,9 +2,7 @@ import BaseServices from "./index";
import Service from "wax-prosemirror-core/src/services/Service";
class BaseService extends Service {
register() {
this.config.pushToArray("services", BaseServices);
}
dependencies = BaseServices;
}
export default BaseService;
......@@ -2,9 +2,10 @@ import DisplayServices from "./index";
import Service from "wax-prosemirror-core/src/services/Service";
class DisplayBlockLevelService extends Service {
register() {
this.config.pushToArray("services", DisplayServices);
}
// register() {
// this.config.pushToArray("services", DisplayServices);
// }
dependencies = DisplayServices;
}
export default DisplayBlockLevelService;
......@@ -5,19 +5,25 @@ export default class ParseRule {
tag = null;
style = null;
exporter = null;
defaultMiddleware = (hook, next) => {
hook = {};
next();
};
constructor({ getAttrs, tag, style }) {
this.tag = tag;
this.style = style;
if (getAttrs) {
this.exporter = new Middleware();
}
// if (getAttrs) {
this.exporter = new Middleware();
// }
this.addStack(getAttrs);
}
addStack(getAttrs) {
if (getAttrs) {
this.exporter.use(getAttrs);
} else {
this.exporter.use(this.defaultMiddleware);
}
}
......
......@@ -2,9 +2,7 @@ import TablesServices from "./index";
import Service from "wax-prosemirror-core/src/services/Service";
class TablesService extends Service {
register() {
this.config.pushToArray("services", TablesServices);
}
dependencies = TablesServices;
}
export default TablesService;
......@@ -2,9 +2,7 @@ import TextServices from "./index";
import Service from "wax-prosemirror-core/src/services/Service";
class TextBlockLevelService extends Service {
register() {
this.config.pushToArray("services", TextServices);
}
dependencies = TextServices;
}
export default TextBlockLevelService;
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment