diff --git a/javascript/src/iframe/viamapi-iframe.js b/javascript/src/iframe/viamapi-iframe.js index e52d27c939f904c0f938585d9a763b16269ce1ab..e89858ef7ff00eceabaaa383623e49d4c4a36d6e 100644 --- a/javascript/src/iframe/viamapi-iframe.js +++ b/javascript/src/iframe/viamapi-iframe.js @@ -1592,6 +1592,21 @@ const connection = Penpal.connectToParent({ // Methods child is exposing to parent methods: { initialize: (apiUrl, wopiUrl, collaboraUrl) => { + if (!apiUrl) { + apiUrl = `${window.location.origin}/api/`; + console.warn(`API host URL not specified. Fall back to ${apiUrl}`); // eslint-disable-line no-console + } + + if (!wopiUrl) { + wopiUrl = `${window.location.origin}/wopi/`; + console.warn(`WOPI host URL not specified. Fall back to ${wopiUrl}`); // eslint-disable-line no-console + } + + if (!collaboraUrl) { + collaboraUrl = window.location.origin; + console.warn(`Collabora host URL not specified. Fall back to ${collaboraUrl}`); // eslint-disable-line no-console + } + window.API_HOST = apiUrl.charAt(apiUrl.length - 1) === "/" ? apiUrl : apiUrl + "/"; window.WOPI_URL = wopiUrl.charAt(wopiUrl.length - 1) === "/" ? wopiUrl : wopiUrl + "/"; window.COLLABORA_URL = collaboraUrl.charAt(collaboraUrl.length - 1) === "/" ? collaboraUrl : collaboraUrl + "/"; diff --git a/javascript/src/viamapi-client.js b/javascript/src/viamapi-client.js index 7c9fea399d2ebac265435027bc6426c127ab1c38..1fa645e73df4f0d1b9dd40e43050508df6b446a8 100644 --- a/javascript/src/viamapi-client.js +++ b/javascript/src/viamapi-client.js @@ -10,26 +10,11 @@ const Penpal = require('penpal').default; * @returns {*} */ function setupViamAPI(divId, methods, iframeUrl, apiUrl, wopiUrl, collaboraUrl) { - if (!apiUrl) { - apiUrl = `${window.location.origin}/api/`; - console.warn(`API host URL not specified. Fall back to ${apiUrl}`); // eslint-disable-line no-console - } - - if (!wopiUrl) { - wopiUrl = `${window.location.origin}/wopi/`; - console.warn(`WOPI host URL not specified. Fall back to ${wopiUrl}`); // eslint-disable-line no-console - } - if (!iframeUrl) { iframeUrl = `${window.location.origin}/vcl/js/iframe`; console.warn(`Iframe URL not specified. Fall back to ${iframeUrl}`); // eslint-disable-line no-console } - if (!collaboraUrl) { - collaboraUrl = window.location.origin; - console.warn(`Collabora host URL not specified. Fall back to ${collaboraUrl}`); // eslint-disable-line no-console - } - const connection = Penpal.connectToChild({ // URL of page to load into iframe. url: iframeUrl,