Removed Japanese fonts support
Now Electron chooses proper fonts. So the feature is no longer necessary.
This commit is contained in:
@@ -13,6 +13,9 @@ Release date: TBD
|
||||
### Improvements
|
||||
- Removed "Display secure content only" option it's no longer necessary.
|
||||
|
||||
#### Windows
|
||||
- Removed Japanese fonts support it's no longer necessary.
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
#### All Platforms
|
||||
|
@@ -1,9 +1,7 @@
|
||||
const React = require('react');
|
||||
const {findDOMNode} = require('react-dom');
|
||||
const {ipcRenderer, remote, shell} = require('electron');
|
||||
const fs = require('fs');
|
||||
const url = require('url');
|
||||
const osLocale = require('os-locale');
|
||||
const electronContextMenu = require('electron-context-menu');
|
||||
|
||||
const ErrorView = require('./ErrorView.jsx');
|
||||
@@ -79,25 +77,6 @@ const MattermostView = React.createClass({
|
||||
webview.addEventListener('dom-ready', () => {
|
||||
// webview.openDevTools();
|
||||
|
||||
// Use 'Meiryo UI' and 'MS Gothic' to prevent CJK fonts on Windows(JP).
|
||||
if (process.platform === 'win32') {
|
||||
function applyCssFile(cssFile) {
|
||||
fs.readFile(cssFile, 'utf8', (err, data) => {
|
||||
if (err) {
|
||||
console.log(err);
|
||||
return;
|
||||
}
|
||||
webview.insertCSS(data);
|
||||
});
|
||||
}
|
||||
|
||||
osLocale().then((locale) => {
|
||||
if (locale === 'ja_JP') {
|
||||
applyCssFile(remote.app.getAppPath() + '/css/jp_fonts.css');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
if (!this.state.isContextMenuAdded) {
|
||||
electronContextMenu({
|
||||
window: webview
|
||||
|
@@ -1,14 +0,0 @@
|
||||
@font-face {
|
||||
font-family: sans-serif;
|
||||
src: local('Meiryo UI');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'sans-serif';
|
||||
src: local('Meiryo UI');
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: monospace;
|
||||
src: local('MS Gothic');
|
||||
}
|
@@ -18,7 +18,6 @@
|
||||
"electron-devtools-installer": "^2.1.0",
|
||||
"electron-is-dev": "^0.1.2",
|
||||
"electron-squirrel-startup": "^1.0.0",
|
||||
"os-locale": "^2.0.0",
|
||||
"react": "^15.4.2",
|
||||
"react-addons-css-transition-group": "^15.4.2",
|
||||
"react-bootstrap": "~0.30.7",
|
||||
|
Reference in New Issue
Block a user