npm run format

This commit is contained in:
Danny Coates 2019-01-24 12:31:20 -08:00
parent 8227b1420c
commit 8794b1d101
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
5 changed files with 35 additions and 45 deletions

View File

@ -24,9 +24,9 @@ function password(state, emit) {
<form class="w-5/6" onsubmit="${checkPassword}" data-no-csrf> <form class="w-5/6" onsubmit="${checkPassword}" data-no-csrf>
<input <input
id="password-input" id="password-input"
class="w-full border rounded ${ class="w-full border rounded ${invalid
invalid ? 'border-red' : 'border-grey' ? 'border-red'
} leading-loose px-2 py-1" : 'border-grey'} leading-loose px-2 py-1"
maxlength="32" maxlength="32"
autocomplete="off" autocomplete="off"
placeholder="${state.translate('unlockInputPlaceholder')}" placeholder="${state.translate('unlockInputPlaceholder')}"

View File

@ -8,15 +8,13 @@ const signupDialog = require('./signupDialog');
module.exports = function(state, emit) { module.exports = function(state, emit) {
const el = html` const el = html`
<div class="px-4 md:px-0"> <div class="px-4 md:px-0">
${ ${raw(
raw( state.translate('frontPageExpireInfo', {
state.translate('frontPageExpireInfo', { downloadCount:
downloadCount: '<span class="lg:inline-block md:block sm:inline-block block"></span><select id="dlCount"></select>',
'<span class="lg:inline-block md:block sm:inline-block block"></span><select id="dlCount"></select>', timespan: '<select id="timespan"></select>'
timespan: '<select id="timespan"></select>' })
}) )}
)
}
</div> </div>
`; `;
if (el.__encoded) { if (el.__encoded) {

View File

@ -8,23 +8,19 @@ module.exports = function(state) {
class="flex flex-col items-center bg-white m-6 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full md:h-full" class="flex flex-col items-center bg-white m-6 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full md:h-full"
> >
<h1 class="text-2xl text-center">${state.translate('legalHeader')}</h1> <h1 class="text-2xl text-center">${state.translate('legalHeader')}</h1>
${ ${raw(
raw( replaceLinks(state.translate('legalNoticeTestPilot'), [
replaceLinks(state.translate('legalNoticeTestPilot'), [ 'https://testpilot.firefox.com/terms',
'https://testpilot.firefox.com/terms', 'https://testpilot.firefox.com/privacy',
'https://testpilot.firefox.com/privacy', 'https://testpilot.firefox.com/experiments/send'
'https://testpilot.firefox.com/experiments/send' ])
]) )}
) ${raw(
} replaceLinks(state.translate('legalNoticeMozilla'), [
${ 'https://www.mozilla.org/privacy/websites/',
raw( 'https://www.mozilla.org/about/legal/terms/mozilla/'
replaceLinks(state.translate('legalNoticeMozilla'), [ ])
'https://www.mozilla.org/privacy/websites/', )}
'https://www.mozilla.org/about/legal/terms/mozilla/'
])
)
}
</div> </div>
</main> </main>
`; `;

View File

@ -9,16 +9,14 @@ module.exports = function(selected, options, translate, changed, htmlId) {
class="appearance-none cursor-pointer border rounded-sm bg-blue-lightest hover:border-blue focus:border-blue px-2 py-1 my-2 h-8" class="appearance-none cursor-pointer border rounded-sm bg-blue-lightest hover:border-blue focus:border-blue px-2 py-1 my-2 h-8"
onchange="${choose}" onchange="${choose}"
> >
${ ${options.map(
options.map( i =>
i => html`
html` <option value="${i}" ${i === selected ? 'selected' : ''}
<option value="${i}" ${i === selected ? 'selected' : ''} >${translate(i)}</option
>${translate(i)}</option >
> `
` )}
)
}
</select> </select>
`; `;

View File

@ -30,12 +30,10 @@ module.exports = function(app) {
timeout: 5000 timeout: 5000
}); });
</script> </script>
${ ${initScript({
initScript({ cspNonce: 'test',
cspNonce: 'test', locale: 'en-US'
locale: 'en-US' })}
})
}
<script src="${assets.get('tests.js')}"></script> <script src="${assets.get('tests.js')}"></script>
</head> </head>
<body> <body>