Skip to content

Commit

Permalink
Fix CI build error
Browse files Browse the repository at this point in the history
  • Loading branch information
trazyn committed Jul 23, 2018
1 parent 599fed8 commit 4724e0e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
dist/*
__tests__/*
src/assets/*
release/*

8 changes: 2 additions & 6 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"impliedStrict": true,
"jsx": true
}
"ecmaVersion": 2018,
"sourceType": "module",
},
"env": {
"es6": true,
Expand Down
2 changes: 2 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"extends": "stylelint-config-standard",
"rules": {
"block-no-empty": null,
"font-family-no-missing-generic-family-keyword": null,
"no-descending-specificity": null,
"color-no-invalid-hex": true,
"declaration-colon-space-after": "always",
"indentation": [4, {
Expand Down
5 changes: 0 additions & 5 deletions src/js/components/MessageInput/Suggestion/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
margin-right: 12px;
}

.Suggestion-username {
padding: 0;
margin: 0;
}

.Suggestion-username {
color: #777;
margin-bottom: 2px;
Expand Down
2 changes: 2 additions & 0 deletions src/js/pages/Home/ChatContent/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ export default class ChatContent extends Component {
&& target.classList.contains('open-image')) {
// Get image from cache and convert to base64
let response = await axios.get(target.src, { responseType: 'arraybuffer' });
// eslint-disable-next-line
let base64 = new window.Buffer(response.data, 'binary').toString('base64');

ipcRenderer.send('open-image', {
Expand Down Expand Up @@ -393,6 +394,7 @@ export default class ChatContent extends Component {
&& target.classList.contains('is-download')) {
let message = this.props.getMessage(e.target.parentElement.dataset.id);
let response = await axios.get(message.file.download, { responseType: 'arraybuffer' });
// eslint-disable-next-line
let base64 = new window.Buffer(response.data, 'binary').toString('base64');
let filename = ipcRenderer.sendSync(
'file-download',
Expand Down

0 comments on commit 4724e0e

Please sign in to comment.