From 3952b2f0131cdb0ebd5f9a9671a5f643ef7ed57e Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 4 Feb 2021 18:12:56 +0100 Subject: [PATCH] Fix PCS issues: duplicate templates and offline PCS --- www/common/common-ui-elements.js | 10 ++++++++++ www/common/outer/async-store.js | 1 + 2 files changed, 11 insertions(+) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 5d33f09ef..3a514eae7 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -2105,6 +2105,16 @@ define([ var sframeChan = common.getSframeChannel(); var metadataMgr = common.getMetadataMgr(); var privateData = metadataMgr.getPrivateData(); + + if (privateData.offline) { + metadataMgr.onChange(function () { + var privateData = metadataMgr.getPrivateData(); + if (privateData.offline) { return; } + UIElements.getPadCreationScreen(common, cfg, appCfg, cb); + }); + return; + } + var type = metadataMgr.getMetadataLazy().type || privateData.app; var fromFileData = privateData.fromFileData; diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index bb6f02938..900172f16 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -1229,6 +1229,7 @@ define([ var data = obj.data; if (channels.indexOf(data.channel) !== -1) { return; } var id = obj.id; + if (data.channel) { channels.push(data.channel); } var parsed = Hash.parsePadUrl(data.href || data.roHref); if ((!types || types.length === 0 || types.indexOf(parsed.type) !== -1) && !isFiltered(parsed.type, data)) {