Skip to content

Get params from attributes #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexander-b-clean wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Get params from attributes #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 23 additions & 13 deletions dist/doboard-widget-bundle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9135,22 +9135,32 @@ class CleanTalkWidgetDoboard {

getParams() {
const script = document.querySelector(`script[src*="doboard-widget-bundle."]`);
if ( ! script || ! script.src ) {
throw new Error('Script not provided');
}

const url = new URL(script.src);
let params = Object.fromEntries(url.searchParams.entries());
const config = typeof window.spotfixConfig === 'object' && window.spotfixConfig ? window.spotfixConfig : null;
let params ={}

if ( script && script.src) {
const url = new URL(script.src);
params = Object.fromEntries(url.searchParams.entries());
const config = typeof window.spotfixConfig === 'object' && window.spotfixConfig ? window.spotfixConfig : null;

// Fallback to spotfixConfig when URL has no params or they are incomplete (e.g. WordPress plugin)
params = {
...params,
projectToken: params.projectToken || config.projectToken || '',
projectId: params.projectId || config.projectId || '',
accountId: params.accountId || config.accountId || ''
};

// Fallback to spotfixConfig when URL has no params or they are incomplete (e.g. WordPress plugin)
if ( config ) {
} else {
const data = document.querySelector('script[data-spotfix="SpotFix"]')
params = {
...params,
projectToken: params.projectToken || config.projectToken || '',
projectId: params.projectId || config.projectId || '',
accountId: params.accountId || config.accountId || ''
...data?.dataset,
projectToken: data?.dataset?.projecttoken || '',
projectId: data?.dataset?.projectid || '',
accountId: data?.dataset?.accountid || ''
};
delete params?.projecttoken;
delete params?.projectid;
delete params?.accountid;
}

if ( ! params.projectToken || ! params.accountId || ! params.projectId ) {
Expand Down
2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/doboard-widget-bundle.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 23 additions & 13 deletions js/src/widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,32 @@ class CleanTalkWidgetDoboard {

getParams() {
const script = document.querySelector(`script[src*="doboard-widget-bundle."]`);
if ( ! script || ! script.src ) {
throw new Error('Script not provided');
}

const url = new URL(script.src);
let params = Object.fromEntries(url.searchParams.entries());
const config = typeof window.spotfixConfig === 'object' && window.spotfixConfig ? window.spotfixConfig : null;
let params ={}

if ( script && script.src) {
const url = new URL(script.src);
params = Object.fromEntries(url.searchParams.entries());
const config = typeof window.spotfixConfig === 'object' && window.spotfixConfig ? window.spotfixConfig : null;

// Fallback to spotfixConfig when URL has no params or they are incomplete (e.g. WordPress plugin)
params = {
...params,
projectToken: params.projectToken || config.projectToken || '',
projectId: params.projectId || config.projectId || '',
accountId: params.accountId || config.accountId || ''
};

// Fallback to spotfixConfig when URL has no params or they are incomplete (e.g. WordPress plugin)
if ( config ) {
} else {
const data = document.querySelector('script[data-spotfix="SpotFix"]')
params = {
...params,
projectToken: params.projectToken || config.projectToken || '',
projectId: params.projectId || config.projectId || '',
accountId: params.accountId || config.accountId || ''
...data?.dataset,
projectToken: data?.dataset?.projecttoken || '',
projectId: data?.dataset?.projectid || '',
accountId: data?.dataset?.accountid || ''
};
delete params?.projecttoken;
delete params?.projectid;
delete params?.accountid;
}

if ( ! params.projectToken || ! params.accountId || ! params.projectId ) {
Expand Down