warn when paste-importing usercss with @preprocessor, #1082

This commit is contained in:
tophf 2020-10-26 17:37:31 +03:00 committed by GitHub
commit 1a7b51be6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 64 additions and 48 deletions

View File

@ -468,6 +468,12 @@
"message": "Import",
"description": "Label for the button to import a style ('edit' page) or all styles ('manage' page)"
},
"importPreprocessor": {
"message": "Style with a <code>@preprocessor</code> won't work in the classic mode. You can switch the editor to Usercss mode: 1) open the style manager, 2) enable \"as Usercss\" checkbox, 3) click \"Write new style\"\n\nImport now anyway?"
},
"importPreprocessorTitle": {
"message": "Potential problem due to @preprocessor"
},
"importReplaceLabel": {
"message": "Overwrite style",
"description": "Label for the button to import and overwrite current style"

View File

@ -8,6 +8,7 @@ const usercssHelper = (() => {
API_METHODS.configUsercssVars = configUsercssVars;
API_METHODS.buildUsercss = build;
API_METHODS.buildUsercssMeta = buildMeta;
API_METHODS.findUsercss = find;
function buildMeta(style) {

View File

@ -176,10 +176,9 @@ function createSection({
});
cm.on('paste', (cm, event) => {
const text = event.clipboardData.getData('text') || '';
if (
text.includes('@-moz-document') &&
text.replace(/\/\*[\s\S]*?(?:\*\/|$)/g, '')
.match(/@-moz-document[\s\r\n]+(url|url-prefix|domain|regexp)\(/)
if (/@-moz-document/i.test(text) &&
/@-moz-document\s+(url|url-prefix|domain|regexp)\(/i
.test(text.replace(/\/\*([^*]|\*(?!\/))*(\*\/|$)/g, ''))
) {
event.preventDefault();
showMozillaFormatImport(text);

View File

@ -48,7 +48,7 @@ function createSectionsEditor(editorBase) {
let sectionOrder = '';
let headerOffset; // in compact mode the header is at the top so it reduces the available height
const ready = initSections(style.sections, {isFirstInit: true});
const ready = initSections(style.sections, {pristine: true});
const livePreview = createLivePreview();
livePreview.show(Boolean(style.id));
@ -333,24 +333,37 @@ function createSectionsEditor(editorBase) {
'Shift-Ctrl-Enter': () => doImport({replaceOldStyle: true}),
};
function doImport({replaceOldStyle = false}) {
async function doImport({replaceOldStyle = false}) {
lockPageUI(true);
API.parseCss({code: popup.codebox.getValue().trim()})
.then(({sections, errors}) => {
try {
const code = popup.codebox.getValue().trim();
if (!/==userstyle==/i.test(code) ||
!await getPreprocessor(code) ||
await messageBox.confirm(
t('importPreprocessor'), 'pre-line',
t('importPreprocessorTitle'))
) {
const {sections, errors} = await API.parseCss({code});
// shouldn't happen but just in case
if (!sections.length || errors.length) {
throw errors;
}
if (replaceOldStyle) {
return replaceSections(sections);
}
return initSections(sections, {focusOn: false});
})
.then(() => {
await initSections(sections, {
replace: replaceOldStyle,
focusOn: replaceOldStyle ? 0 : false,
});
$('.dismiss').dispatchEvent(new Event('click'));
})
.catch(showError)
.then(() => lockPageUI(false));
}
} catch (err) {
showError(err);
}
lockPageUI(false);
}
async function getPreprocessor(code) {
try {
return (await API.buildUsercssMeta({sourceCode: code})).usercssData.preprocessor;
} catch (e) {}
}
function lockPageUI(locked) {
@ -451,8 +464,14 @@ function createSectionsEditor(editorBase) {
function initSections(originalSections, {
focusOn = 0,
isFirstInit,
replace = false,
pristine = false,
} = {}) {
if (replace) {
sections.forEach(s => s.remove(true));
sections.length = 0;
container.textContent = '';
}
let done;
const total = originalSections.length;
originalSections = originalSections.slice();
@ -464,7 +483,7 @@ function createSectionsEditor(editorBase) {
const t0 = performance.now();
while (originalSections.length && performance.now() - t0 < 100) {
insertSectionAfter(originalSections.shift(), undefined, forceRefresh);
if (isFirstInit) dirty.clear();
if (pristine) dirty.clear();
if (focusOn !== false && sections[focusOn]) {
sections[focusOn].cm.focus();
focusOn = false;
@ -572,19 +591,12 @@ function createSectionsEditor(editorBase) {
updateSectionOrder();
}
function replaceSections(...args) {
for (const section of sections) {
section.remove(true);
}
sections.length = 0;
container.textContent = '';
return initSections(...args);
}
function replaceStyle(newStyle, codeIsUpdated) {
async function replaceStyle(newStyle, codeIsUpdated) {
dirty.clear('name');
// FIXME: avoid recreating all editors?
reinit().then(() => {
if (codeIsUpdated !== false) {
await initSections(newStyle.sections, {replace: true, pristine: true});
}
Object.assign(style, newStyle);
updateHeader();
dirty.clear();
@ -595,13 +607,5 @@ function createSectionsEditor(editorBase) {
}
livePreview.show(Boolean(style.id));
updateLivePreview();
});
function reinit() {
if (codeIsUpdated !== false) {
return replaceSections(newStyle.sections, {isFirstInit: true});
}
return Promise.resolve();
}
}
}

View File

@ -56,6 +56,10 @@
text-align: left;
}
#message-box.pre-line #message-box-contents {
white-space: pre-line;
}
#message-box-title {
font-weight: bold;
background-color: rgb(145, 208, 198);

View File

@ -168,10 +168,12 @@ messageBox.alert = (contents, className, title) =>
/**
* @param {String|Node|Array<String|Node>} contents
* @param {String} [className] like 'pre' for monospace font
* @param {String} [title]
* @returns {Promise<Boolean>} resolves to true when confirmed
*/
messageBox.confirm = (contents, className) =>
messageBox.confirm = (contents, className, title) =>
messageBox({
title,
contents,
className: `center ${className || ''}`,
buttons: [t('confirmYes'), t('confirmNo')]