diff --git a/dist/article/article.css b/dist/article/article.css index 68e4977..f69ccb9 100644 --- a/dist/article/article.css +++ b/dist/article/article.css @@ -3,8 +3,7 @@ html, body { margin: 0; - font-family: "Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", - sans-serif; + font-family: "Segoe UI", "Source Han Sans Regular", sans-serif; } body { padding: 12px 96px 32px; diff --git a/dist/styles/global.css b/dist/styles/global.css index fa934eb..8b6e63f 100644 --- a/dist/styles/global.css +++ b/dist/styles/global.css @@ -49,12 +49,27 @@ body.darwin { html, body { background-color: transparent; - font-family: "Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", - sans-serif; + font-family: "Segoe UI", "Source Han Sans Regular", sans-serif; height: 100%; overflow: hidden; margin: 0; } +body:lang(zh-CN) { + font-family: "Segoe UI", "Source Han Sans SC Regular", "Microsoft YaHei", + sans-serif; +} +body:lang(zh-TW) { + font-family: "Segoe UI", "Source Han Sans TC Regular", "Microsoft JhengHei", + sans-serif; +} +body:lang(ja) { + font-family: "Segoe UI", "Source Han Sans JP Regular", "Yu Gothic UI", + sans-serif; +} +body:lang(ko) { + font-family: "Segoe UI", "Source Han Sans KR Regular", "Malgun Gothic", + sans-serif; +} body.win32, body.linux { background-color: var(--neutralLighterAlt); diff --git a/electron-builder-mas.yml b/electron-builder-mas.yml index f760f6b..0390607 100644 --- a/electron-builder-mas.yml +++ b/electron-builder-mas.yml @@ -1,5 +1,5 @@ appId: DevHYLiu.FluentReader -buildVersion: 25 +buildVersion: 26 productName: Fluent Reader copyright: Copyright © 2020 Haoyuan Liu files: @@ -29,6 +29,9 @@ mac: - it - nl - ko + - ru + - pt_BR + - pt_PT minimumSystemVersion: 10.14.0 mas: entitlements: build/entitlements.mas.plist diff --git a/electron-builder.yml b/electron-builder.yml index 047ed1d..ee8e1a9 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -26,6 +26,9 @@ mac: - it - nl - ko + - ru + - pt_BR + - pt_PT win: target: - nsis @@ -49,6 +52,9 @@ appx: - it - nl - ko + - ru + - pt-BR + - pt-PT showNameOnTiles: true setBuildNumber: true nsis: diff --git a/package-lock.json b/package-lock.json index 519a19a..5db86f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fluent-reader", - "version": "1.1.0", + "version": "1.1.1", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 3d889a2..07d710b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fluent-reader", - "version": "1.1.0", + "version": "1.1.1", "description": "Modern desktop RSS reader", "main": "./dist/electron.js", "scripts": { diff --git a/src/components/article.tsx b/src/components/article.tsx index 1543458..18a640a 100644 --- a/src/components/article.tsx +++ b/src/components/article.tsx @@ -328,17 +328,22 @@ class Article extends React.Component { } loadFull = async () => { this.setState({ fullContent: "", loaded: false, error: false }) + const link = this.props.item.link try { - const result = await fetch(this.props.item.link) + const result = await fetch(link) if (!result || !result.ok) throw new Error() const html = await decodeFetchResponse(result, true) - this.setState({ fullContent: html }) + if (link === this.props.item.link) { + this.setState({ fullContent: html }) + } } catch { - this.setState({ - loaded: true, - error: true, - errorDescription: "MERCURY_PARSER_FAILURE", - }) + if (link === this.props.item.link) { + this.setState({ + loaded: true, + error: true, + errorDescription: "MERCURY_PARSER_FAILURE", + }) + } } } @@ -467,7 +472,8 @@ class Article extends React.Component { className={this.state.error ? "error" : ""} key={ this.props.item._id + - (this.state.loadWebpage ? "_" : "") + (this.state.loadWebpage ? "_" : "") + + (this.state.loadFull ? "__" : "") } src={ this.state.loadWebpage diff --git a/src/components/cards/compact-card.tsx b/src/components/cards/compact-card.tsx index 566bfdc..e7eb594 100644 --- a/src/components/cards/compact-card.tsx +++ b/src/components/cards/compact-card.tsx @@ -23,10 +23,15 @@ const CompactCard: React.FunctionComponent = props => ( text={props.item.title} filter={props.filter} title + dir={props.source.textDir} /> - +