Do not rely on the HTML file to identify where nodes are registered from

This commit is contained in:
Nick O'Leary
2016-04-28 11:23:42 +01:00
parent 47316b0fb7
commit 45ff86eae5
5 changed files with 44 additions and 16 deletions

View File

@@ -1,5 +1,5 @@
/**
* Copyright 2015 IBM Corp.
* Copyright 2015, 2016 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -347,7 +347,7 @@ function inheritNode(constructor) {
}
}
function registerNodeConstructor(type,constructor) {
function registerNodeConstructor(nodeSet,type,constructor) {
if (nodeConstructors[type]) {
throw new Error(type+" already registered");
}
@@ -358,6 +358,17 @@ function registerNodeConstructor(type,constructor) {
inheritNode(constructor);
}
var nodeSetInfo = getFullNodeInfo(nodeSet);
if (nodeSetInfo) {
if (nodeSetInfo.types.indexOf(type) === -1) {
// A type is being registered for a known set, but for some reason
// we didn't spot it when parsing the HTML file.
// Registered a type is the definitive action - not the presence
// of an edit template. Ensure it is on the list of known types.
nodeSetInfo.types.push(type);
}
}
nodeConstructors[type] = constructor;
events.emit("type-registered",type);
}