open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embed replaceSections as replace option of initSections

Browse Source
This commit is contained in:
tophf 2020-10-26 17:24:11 +03:00
parent 4eabdf3f57
commit 34ad3cfaef
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
edit/sections-editor.js
View File

@ -48,7 +48,7 @@ function createSectionsEditor(editorBase) {
let sectionOrder = ''; let sectionOrder = '';
let headerOffset; // in compact mode the header is at the top so it reduces the available height 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(); const livePreview = createLivePreview();
livePreview.show(Boolean(style.id)); livePreview.show(Boolean(style.id));
@ -348,11 +348,10 @@ function createSectionsEditor(editorBase) {
if (!sections.length || errors.length) { if (!sections.length || errors.length) {
throw errors; throw errors;
} }
if (replaceOldStyle) { await initSections(sections, {
replaceSections(sections); replace: replaceOldStyle,
} else { focusOn: replaceOldStyle ? 0 : false,
initSections(sections, {focusOn: false}); });
}
$('.dismiss').dispatchEvent(new Event('click')); $('.dismiss').dispatchEvent(new Event('click'));
} }
} catch (err) { } catch (err) {
@ -465,8 +464,14 @@ function createSectionsEditor(editorBase) {
function initSections(originalSections, { function initSections(originalSections, {
focusOn = 0, focusOn = 0,
isFirstInit, replace = false,
pristine = false,
} = {}) { } = {}) {
if (replace) {
sections.forEach(s => s.remove(true));
sections.length = 0;
container.textContent = '';
}
let done; let done;
const total = originalSections.length; const total = originalSections.length;
originalSections = originalSections.slice(); originalSections = originalSections.slice();
@ -478,7 +483,7 @@ function createSectionsEditor(editorBase) {
const t0 = performance.now(); const t0 = performance.now();
while (originalSections.length && performance.now() - t0 < 100) { while (originalSections.length && performance.now() - t0 < 100) {
insertSectionAfter(originalSections.shift(), undefined, forceRefresh); insertSectionAfter(originalSections.shift(), undefined, forceRefresh);
if (isFirstInit) dirty.clear(); if (pristine) dirty.clear();
if (focusOn !== false && sections[focusOn]) { if (focusOn !== false && sections[focusOn]) {
sections[focusOn].cm.focus(); sections[focusOn].cm.focus();
focusOn = false; focusOn = false;
@ -586,15 +591,6 @@ function createSectionsEditor(editorBase) {
updateSectionOrder(); updateSectionOrder();
} }
function replaceSections(...args) {
for (const section of sections) {
section.remove(true);
}
sections.length = 0;
container.textContent = '';
return initSections(...args);
}
function replaceStyle(newStyle, codeIsUpdated) { function replaceStyle(newStyle, codeIsUpdated) {
dirty.clear('name'); dirty.clear('name');
// FIXME: avoid recreating all editors? // FIXME: avoid recreating all editors?
@ -613,7 +609,7 @@ function createSectionsEditor(editorBase) {
function reinit() { function reinit() {
if (codeIsUpdated !== false) { if (codeIsUpdated !== false) {
return replaceSections(newStyle.sections, {isFirstInit: true}); return initSections(newStyle.sections, {replace: true, pristine: true});
} }
return Promise.resolve(); return Promise.resolve();
} }