From 189f036290d9fcc1fff642fda739253e5103639a Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Tue, 3 Nov 2020 12:25:23 +0100 Subject: [PATCH] EHN: ext_applicable._make_fallback returns undefined when fallback is undefined --- src/core/js/ext_applicable.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/core/js/ext_applicable.js b/src/core/js/ext_applicable.js index 8ff06bc0..55e3bc2a 100644 --- a/src/core/js/ext_applicable.js +++ b/src/core/js/ext_applicable.js @@ -233,11 +233,14 @@ var ext_applicable = function($, logger, is_in_view_port, load_config, getEntity * @return {Creator} */ const _make_fallback_creator = function(fallback) { - return { - id: "_generated_fallback_creator", - is_applicable: (entity) => true, // always applicable - create: typeof fallback === "function" ? fallback : (entity) => fallback, - }; + if (fallback) { + return { + id: "_generated_fallback_creator", + is_applicable: (entity) => true, // always applicable + create: typeof fallback === "function" ? fallback : (entity) => fallback, + }; + } + return undefined; } const _make_creator = function (c) { @@ -289,7 +292,8 @@ var ext_applicable = function($, logger, is_in_view_port, load_config, getEntity const _make_get_container_wrapper = function (get_container_cb, app_name) { const _wrapper = function (entity) { const container = get_container_cb(entity); - if(!$(container).data(app_name)) { + const app_done = $(container).data(app_name); + if(!app_done) { // mark container as used $(container).data(app_name, "done"); return container -- GitLab