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

Merge branch 'master' into uso2archive

Browse Source
This commit is contained in:
tophf 2021-02-02 00:42:08 +03:00
commit 608c73402f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
edit/sections-editor.js
View File

@ -371,6 +371,7 @@ function SectionsEditor() {
await initSections(sections, {
replace: replaceOldStyle,
focusOn: replaceOldStyle ? 0 : false,
keepDirty: true,
});
helpPopup.close();
}
@ -473,6 +474,7 @@ function SectionsEditor() {
async function initSections(src, {
focusOn = 0,
replace = false,
keepDirty = false, // used by import
} = {}) {
if (replace) {
sections.forEach(s => s.remove(true));
@ -505,7 +507,7 @@ function SectionsEditor() {
if (si) forceRefresh = y < si.scrollY2 && (y += si.cms[i].parentHeight) > si.scrollY;
insertSectionAfter(src[i], null, forceRefresh, si && si.cms[i]);
setGlobalProgress(i, src.length);
dirty.clear();
if (!keepDirty) dirty.clear();
if (i === focusOn) sections[i].cm.focus();
}
if (!si) requestAnimationFrame(fitToAvailableSpace);

9
js/csslint/parserlib.js
View File

@ -101,6 +101,7 @@ self.parserlib = (() => {
'push-button | hyperlink | radio | radio-button | checkbox | menu-item | tab | menu | ' +
'menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | ' +
'outline-tree | range | field | combo-box | signature | password | normal',
'aspect-ratio': 'auto || [ <nonnegative-num> / <nonnegative-num> ]',
'azimuth': '<azimuth>',
'backdrop-filter': '<filter-function-list> | none',
@ -182,6 +183,7 @@ self.parserlib = (() => {
'clip-path': '<clip-source> | <clip-path> | none',
'clip-rule': 'nonzero | evenodd',
'color': '<color>',
'color-adjust': 'economy | exact',
'color-interpolation': 'auto | sRGB | linearRGB',
'color-interpolation-filters': 'auto | sRGB | linearRGB',
'color-profile': 1,
@ -284,6 +286,7 @@ self.parserlib = (() => {
'font-variant-position': 'normal | sub | super',
'font-variation-settings': 'normal | [ <string> <number> ]#',
'font-weight': '<font-weight>',
'forced-color-adjust': 'auto | none',
'-ms-flex-align': 1,
'-ms-flex-order': 1,
'-ms-flex-pack': 1,
@ -681,7 +684,6 @@ self.parserlib = (() => {
dpcm: 'resolution',
dppx: 'resolution',
x: 'resolution',
ar: 'dimension',
};
// Sticky `y` flag must be used in expressions used with peekTest and readMatch
const rxIdentStart = /[-\\_a-zA-Z\u00A0-\uFFFF]/u;
@ -703,7 +705,6 @@ self.parserlib = (() => {
!/^(unset|initial|inherit|will-change|auto|scroll-position|contents)$/i.test(p),
'<angle>': p => p.type === 'angle' || p.isCalc,
'<angle-or-0>': p => p.text === '0' || p.type === 'angle' || p.isCalc,
'<aspect-ratio>': p => p.units && lowerCmp(p.units, 'ar'),
'<attr>': vtIsAttr,
'<attachment>': 'scroll | fixed | local',
'<bg-image>': '<image> | none',
@ -806,7 +807,7 @@ self.parserlib = (() => {
const VTComplex = {
'<align-content>': 'normal | <baseline-position> | <content-distribution> | ' +
'<aspect-ratio> <content-distribution>? | <overflow-position>? <content-position>',
'<overflow-position>? <content-position>',
'<align-self>':
'auto | normal | stretch | <baseline-position> | <overflow-position>? <self-position>',
'<auto-repeat>':
@ -917,7 +918,7 @@ self.parserlib = (() => {
'<grid-template-rows>': '<grid-template-columns>',
'<hsl-color>': '[ <number> | <angle> ] <percentage>{2} [ / <nonnegative-num-pct> ]? | ' +
'[ <number> | <angle> ] , <percentage>#{2} [ , <nonnegative-num-pct> ]?',
'<justify-content>': 'normal | <content-distribution> | <aspect-ratio> <content-distribution>? | ' +
'<justify-content>': 'normal | <content-distribution> | ' +
'<overflow-position>? [ <content-position> | left | right ]',
'<justify-self>': 'auto | normal | stretch | <baseline-position> | <overflow-position>? ' +
'[ <self-position> | left | right ]',