diff --git a/BuildExamples.sh b/BuildExamples.sh index 24d5966..2249b76 100644 --- a/BuildExamples.sh +++ b/BuildExamples.sh @@ -2,7 +2,7 @@ . ./BuildLib.sh buildHtml(){ - useBuilder "Build.BuildHtmlFile('$1', { outputFile: '$2' })" + useBuilder "BuildHtmlFile('$1', { outputFile: '$2' })" } for example in Server diff --git a/BuildLib.sh b/BuildLib.sh index 2f5a8b8..d7465fb 100644 --- a/BuildLib.sh +++ b/BuildLib.sh @@ -5,7 +5,7 @@ useBuilder(){ } buildScript(){ - useBuilder "Build.BuildScriptFile('$1')" + useBuilder "BuildScriptFile('$1')" } for file in ./SpaccDotWeb.js ./SpaccDotWeb.*.js diff --git a/SpaccDotWeb.Alt.js b/SpaccDotWeb.Alt.js index 243c8b6..1a65883 100644 --- a/SpaccDotWeb.Alt.js +++ b/SpaccDotWeb.Alt.js @@ -92,23 +92,27 @@ SpaccDotWeb.sleep = (ms) => (new Promise((resolve) => setTimeout(resolve, ms))); SpaccDotWeb.Sleep = SpaccDotWeb.sleep; - SpaccDotWeb.$ = (query) => { + SpaccDotWeb.$ = (query, extra) => ((query.startsWith('<') && query.endsWith('>')) + ? Object.assign(Object.assign(document.createElement('div'), { innerHTML: query }).querySelector('*'), extra) + : SpaccDotWeb.query(query)); + + SpaccDotWeb.query = (query) => { query = query.trim(); return (query.startsWith('::') - ? arrayFrom(document.querySelectorAll(domSpecialQuery(query.slice(2).trim()))) + ? Array.from(document.querySelectorAll(domSpecialQuery(query.slice(2).trim()))) : document.querySelector(domSpecialQuery(query)) ); - } - + }; + function domSpecialQuery (query) { const chars = []; let buffer = []; let brackets = 0; - for (const char of query) { + for (const char of `${query} `) { if (brackets === 0) { if (buffer.length > 0) { buffer = buffer.join(''); - if (!buffer.includes('=')) { + if (!buffer.includes('=') && (buffer.includes('"') || buffer.includes("'"))) { buffer = `name=${buffer}`; } chars.push(buffer); diff --git a/SpaccDotWeb.Build/Example.html b/SpaccDotWeb.Build/Example.html index 45e5b27..1fd7a5f 100644 --- a/SpaccDotWeb.Build/Example.html +++ b/SpaccDotWeb.Build/Example.html @@ -31,32 +31,31 @@ alerter("It's a nice day today, innit?");