From bdcaef60c90fc0bdcc877662835ec05a0f7cea93 Mon Sep 17 00:00:00 2001 From: sairaj mote Date: Sun, 11 Dec 2022 19:37:29 +0530 Subject: [PATCH] Formatting bug fix --- components/index.html | 17 ++++++++++------- components/index.min.html | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/components/index.html b/components/index.html index cde1e19..398fb3b 100644 --- a/components/index.html +++ b/components/index.html @@ -2366,7 +2366,7 @@ async function downloadComponents() { const sourceCode = await getFormattedSourceCode() if (sourceCode) { - downloadJs(sourceCode, { minified: getRef('get_minified').checked }) + downloadJs(sourceCode) } else { notify('Please select at least one component', 'error') } @@ -2375,7 +2375,6 @@ async function copySourceCode() { const sourceCode = await getFormattedSourceCode() if (sourceCode) { - // replace all whitespace with single space and remove new line characters window.navigator.clipboard.writeText(sourceCode).then(success => { notify('Copied components source code') }).catch(err => console.error(error)) @@ -2389,9 +2388,13 @@ const selectedComponents = await getSelectedComponents() if (selectedComponents.length) { const selectedComponentsList = [...getRef('components_selection_list').querySelectorAll('sm-checkbox[checked]')].map(v => v.value) - // replace all whitespace with single space and remove new line characters - const componentsSourceCode = selectedComponents.map(v => v.replace(/\s+/g, ' ').replace(/\\n/g, '')).join("\n") - return `// Components downloaded: ${selectedComponentsList.join(',')}\n${componentsSourceCode}` + const minified = getRef('get_minified').checked + let componentsSourceCode = selectedComponents + if (minified) { + // replace all whitespace with single space and remove new line characters + componentsSourceCode = selectedComponents.map(v => v.replace(/\s+/g, ' ').replace(/\\n/g, '')) + } + return `// Components downloaded: ${selectedComponentsList.join(',')}\n${componentsSourceCode.join("\n")}` } else { return false } @@ -2402,8 +2405,8 @@ const files = await fetch('https://api.github.com/repos/ranchimall/standard-ui/contents/components/dist') allComponentsObj = await files.json() } - function downloadJs(sourceCode, options = { minified: true }) { - const { minified } = options + function downloadJs(sourceCode) { + const minified = getRef('get_minified').checked const extension = minified ? '.min.js' : '.js' const element = createElement('a', { attributes: { diff --git a/components/index.min.html b/components/index.min.html index 0f6001f..c8f7708 100644 --- a/components/index.min.html +++ b/components/index.min.html @@ -752,7 +752,7 @@ async function downloadComponents() { const sourceCode = await getFormattedSourceCode() if (sourceCode) { - downloadJs(sourceCode, { minified: getRef('get_minified').checked }) + downloadJs(sourceCode) } else { notify('Please select at least one component', 'error') } @@ -761,7 +761,6 @@ async function copySourceCode() { const sourceCode = await getFormattedSourceCode() if (sourceCode) { - // replace all whitespace with single space and remove new line characters window.navigator.clipboard.writeText(sourceCode).then(success => { notify('Copied components source code') }).catch(err => console.error(error)) @@ -775,9 +774,13 @@ const selectedComponents = await getSelectedComponents() if (selectedComponents.length) { const selectedComponentsList = [...getRef('components_selection_list').querySelectorAll('sm-checkbox[checked]')].map(v => v.value) - // replace all whitespace with single space and remove new line characters - const componentsSourceCode = selectedComponents.map(v => v.replace(/\s+/g, ' ').replace(/\\n/g, '')).join("\n") - return `// Components downloaded: ${selectedComponentsList.join(',')}\n${componentsSourceCode}` + const minified = getRef('get_minified').checked + let componentsSourceCode = selectedComponents + if (minified) { + // replace all whitespace with single space and remove new line characters + componentsSourceCode = selectedComponents.map(v => v.replace(/\s+/g, ' ').replace(/\\n/g, '')) + } + return `// Components downloaded: ${selectedComponentsList.join(',')}\n${componentsSourceCode.join("\n")}` } else { return false } @@ -788,8 +791,8 @@ const files = await fetch('https://api.github.com/repos/ranchimall/standard-ui/contents/components/dist') allComponentsObj = await files.json() } - function downloadJs(sourceCode, options = { minified: true }) { - const { minified } = options + function downloadJs(sourceCode) { + const minified = getRef('get_minified').checked const extension = minified ? '.min.js' : '.js' const element = createElement('a', { attributes: {