Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Anki css scoping breaking due to Anki shipping with incredibly out of date Chromium version (112) #1747

Merged
merged 2 commits into from
Jan 5, 2025
Merged

Fix Anki css scoping breaking due to Anki shipping with incredibly out of date Chromium version (112) #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9200ee
Add addScopeToCssLegacy for Anki css scoping
Kuuuube Jan 4, 2025
9a50338
Fix tests
Kuuuube Jan 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions ext/js/core/utilities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,3 +282,36 @@ export function sanitizeCSS(css) {
export function addScopeToCss(css, scopeSelector) {
return scopeSelector + ' {' + css + '\n}';
}

/**
* Older browser versions do not support nested css and cannot use the normal `addScopeToCss`.
* All major web browsers should be fine but Anki is still distributing Chromium 112 on some platforms as of Anki version 24.11.
* Chromium 120+ is required for full support.
* @param {string} css
* @param {string} scopeSelector
* @returns {string}
*/
export function addScopeToCssLegacy(css, scopeSelector) {
const stylesheet = new CSSStyleSheet();
// nodejs must fall back to the normal version of the function
if (typeof stylesheet.replaceSync === 'undefined') {
return addScopeToCss(css, scopeSelector);
}
stylesheet.replaceSync(css);
const newCSSRules = [];
for (const cssRule of stylesheet.cssRules) {
// ignore non-style rules
if (!(cssRule instanceof CSSStyleRule)) {
continue;
}

const newSelectors = [];
for (const selector of cssRule.selectorText.split(',')) {
newSelectors.push(scopeSelector + ' ' + selector);
}
const newRule = cssRule.cssText.replace(cssRule.selectorText, newSelectors.join(', '));
newCSSRules.push(newRule);
}
stylesheet.replaceSync(newCSSRules.join('\n'));
return [...stylesheet.cssRules].map((rule) => rule.cssText || '').join('\n');
}
6 changes: 3 additions & 3 deletions ext/js/data/anki-note-data-creator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

import {addScopeToCss} from '../core/utilities.js';
import {addScopeToCssLegacy} from '../core/utilities.js';
import {getDisambiguations, getGroupedPronunciations, getPronunciationsOfType, getTermFrequency, groupTermTags} from '../dictionary/dictionary-data-util.js';
import {distributeFurigana, distributeFuriganaInflected} from '../language/ja/japanese.js';

Expand Down Expand Up @@ -584,7 +584,7 @@ function getTermDictionaryEntryCommonInfo(dictionaryEntry, type, dictionaryStyle
* @returns {string}
*/
function addGlossaryScopeToCss(css) {
return addScopeToCss(css, '.yomitan-glossary');
return addScopeToCssLegacy(css, '.yomitan-glossary');
}

/**
Expand All @@ -597,7 +597,7 @@ function addDictionaryScopeToCss(css, dictionaryTitle) {
.replace(/\\/g, '\\\\')
.replace(/"/g, '\\"');

return addScopeToCss(css, `[data-dictionary="${escapedTitle}"]`);
return addScopeToCssLegacy(css, `[data-dictionary="${escapedTitle}"]`);
}

/**
Expand Down
Loading