Skip to content

Commit 0910cd1

Browse files
sergeytsergeyt
committed
use spaces
1 parent d9d183a commit 0910cd1

File tree

10 files changed

+251
-258
lines changed

10 files changed

+251
-258
lines changed

‎.editorconfig

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
root = true
33

44
[*]
5-
indent_style = tab
5+
indent_style = space
66
indent_size = 2
77
end_of_line = crlf
88
charset = utf-8
@@ -11,9 +11,3 @@ insert_final_newline = true
1111

1212
[*.md]
1313
trim_trailing_whitespace = false
14-
15-
[.*rc]
16-
indent_style = space
17-
18-
[.json]
19-
indent_style = space

‎.eslintrc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515

1616
"rules": {
1717
"id-length": 0,
18-
"indent": [2, "tab"],
18+
"indent": ["error", 2, {"SwitchCase": 1}],
1919
"no-console": 0,
20-
"no-tabs": 0,
2120
"func-names": 0,
2221
"linebreak-style": 0,
2322
"import/no-extraneous-dependencies": 0,
2423
"react/no-multi-comp": 0,
2524
"react/prop-types": 0,
26-
"react/jsx-indent": [2, "tab"]
25+
"react/jsx-indent": ["error", 2]
2726
}
2827
}

‎demo/app.jsx

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -4,70 +4,70 @@ import { Grid, Row, Col } from 'react-bootstrap';
44
import DiffView from '../src';
55

66
const contentLinks = [
7-
{
8-
url: 'https://api.github.com/repos/reactbits/diffview/commits/0f73f850f7bebfc90ee641501eed7889d6f11b45',
9-
headers: {
10-
Accept: 'application/vnd.github.diff',
11-
},
12-
label: 'github',
13-
},
14-
{
15-
url: '/content/simple.diff',
16-
label: 'simple',
17-
},
7+
{
8+
url: 'https://api.github.com/repos/reactbits/diffview/commits/0f73f850f7bebfc90ee641501eed7889d6f11b45',
9+
headers: {
10+
Accept: 'application/vnd.github.diff',
11+
},
12+
label: 'github',
13+
},
14+
{
15+
url: '/content/simple.diff',
16+
label: 'simple',
17+
},
1818
];
1919

2020
export default class App extends Component {
21-
constructor(props) {
22-
super(props);
23-
this.state = { content: '' };
24-
this.load(contentLinks[0]);
25-
}
21+
constructor(props) {
22+
super(props);
23+
this.state = { content: '' };
24+
this.load(contentLinks[0]);
25+
}
2626

27-
load(data) {
28-
const options = { headers: data.headers };
29-
fetch(data.url, options).then((xhr, content) => {
30-
if (_.isObject(content) && _.isArray(content.files)) {
31-
this.setState({ content: content.files });
32-
} else {
33-
this.setState({ content });
34-
}
35-
});
36-
}
27+
load(data) {
28+
const options = { headers: data.headers };
29+
fetch(data.url, options).then((xhr, content) => {
30+
if (_.isObject(content) && _.isArray(content.files)) {
31+
this.setState({ content: content.files });
32+
} else {
33+
this.setState({ content });
34+
}
35+
});
36+
}
3737

38-
render() {
39-
const items = contentLinks.map(t => {
40-
const linkProps = {
41-
key: t.url,
42-
href: t.url,
43-
onClick: (e) => {
44-
e.preventDefault();
45-
this.load(t);
46-
return false;
47-
},
48-
style: {
49-
margin: '4px',
50-
},
51-
};
52-
return <a {...linkProps}>{t.label}</a>;
53-
});
54-
let content = null;
55-
if (_.isArray(this.state.content)) {
56-
content = this.state.content.map(file =>
57-
<DiffView key={file.filename} source={file.patch} />
58-
);
59-
} else {
60-
content = <DiffView source={this.state.content} />;
61-
}
62-
return (
63-
<Grid className="app">
64-
<Row>
65-
<Col md={8}>
66-
<div>{items}</div>
67-
{content}
68-
</Col>
69-
</Row>
70-
</Grid>
71-
);
72-
}
38+
render() {
39+
const items = contentLinks.map(t => {
40+
const linkProps = {
41+
key: t.url,
42+
href: t.url,
43+
onClick: (e) => {
44+
e.preventDefault();
45+
this.load(t);
46+
return false;
47+
},
48+
style: {
49+
margin: '4px',
50+
},
51+
};
52+
return <a {...linkProps}>{t.label}</a>;
53+
});
54+
let content = null;
55+
if (_.isArray(this.state.content)) {
56+
content = this.state.content.map(file =>
57+
<DiffView key={file.filename} source={file.patch} />
58+
);
59+
} else {
60+
content = <DiffView source={this.state.content} />;
61+
}
62+
return (
63+
<Grid className="app">
64+
<Row>
65+
<Col md={8}>
66+
<div>{items}</div>
67+
{content}
68+
</Col>
69+
</Row>
70+
</Grid>
71+
);
72+
}
7373
}

‎lib/change.js

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
Object.defineProperty(exports, "__esModule", {
4-
value: true
4+
value: true
55
});
66
exports.default = Change;
77

@@ -24,38 +24,38 @@ var _style2 = _interopRequireDefault(_style);
2424
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2525

2626
function Change(props) {
27-
var ln1 = props.normal ? props.ln1 : props.ln;
28-
var ln2 = props.normal ? props.ln2 : props.ln;
29-
30-
var html = props.content;
31-
var contentCell = null;
32-
33-
try {
34-
html = (0, _prismjsPackage2.default)(props.content, props.lang);
35-
contentCell = _react2.default.createElement('td', { dangerouslySetInnerHTML: { __html: html } });
36-
} catch (e) {
37-
console.log('highlight error:', e);
38-
contentCell = _react2.default.createElement(
39-
'td',
40-
null,
41-
_react2.default.createElement('pre', { dangerouslySetInnerHTML: { __html: html } })
42-
);
43-
}
44-
45-
var className = (0, _classnames2.default)(_style2.default[props.type], _style2.default.change);
46-
return _react2.default.createElement(
47-
'tr',
48-
{ className: className },
49-
_react2.default.createElement(
50-
'td',
51-
{ className: _style2.default.nostretch },
52-
!props.add && ln1
53-
),
54-
_react2.default.createElement(
55-
'td',
56-
{ className: _style2.default.nostretch },
57-
!props.del && ln2
58-
),
59-
contentCell
60-
);
27+
var ln1 = props.normal ? props.ln1 : props.ln;
28+
var ln2 = props.normal ? props.ln2 : props.ln;
29+
30+
var html = props.content;
31+
var contentCell = null;
32+
33+
try {
34+
html = (0, _prismjsPackage2.default)(props.content, props.lang);
35+
contentCell = _react2.default.createElement('td', { dangerouslySetInnerHTML: { __html: html } });
36+
} catch (e) {
37+
console.log('highlight error:', e);
38+
contentCell = _react2.default.createElement(
39+
'td',
40+
null,
41+
_react2.default.createElement('pre', { dangerouslySetInnerHTML: { __html: html } })
42+
);
43+
}
44+
45+
var className = (0, _classnames2.default)(_style2.default[props.type], _style2.default.change);
46+
return _react2.default.createElement(
47+
'tr',
48+
{ className: className },
49+
_react2.default.createElement(
50+
'td',
51+
{ className: _style2.default.nostretch },
52+
!props.add && ln1
53+
),
54+
_react2.default.createElement(
55+
'td',
56+
{ className: _style2.default.nostretch },
57+
!props.del && ln2
58+
),
59+
contentCell
60+
);
6161
}

‎lib/chunk.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

33
Object.defineProperty(exports, "__esModule", {
4-
value: true
4+
value: true
55
});
66

77
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -23,31 +23,31 @@ var _style2 = _interopRequireDefault(_style);
2323
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2424

2525
function Chunk(props) {
26-
var changes = props.changes.map(function (change, i) {
27-
return _react2.default.createElement(_change2.default, _extends({ key: i }, change, { lang: props.lang }));
28-
});
29-
return _react2.default.createElement(
30-
'tbody',
31-
null,
32-
_react2.default.createElement(
33-
'tr',
34-
{ className: _style2.default.chunk },
35-
_react2.default.createElement(
36-
'td',
37-
{ className: _style2.default.nostretch },
38-
'---'
39-
),
40-
_react2.default.createElement(
41-
'td',
42-
{ className: _style2.default.nostretch },
43-
'+++'
44-
),
45-
_react2.default.createElement(
46-
'td',
47-
null,
48-
props.content
49-
)
50-
),
51-
changes
52-
);
26+
var changes = props.changes.map(function (change, i) {
27+
return _react2.default.createElement(_change2.default, _extends({ key: i }, change, { lang: props.lang }));
28+
});
29+
return _react2.default.createElement(
30+
'tbody',
31+
null,
32+
_react2.default.createElement(
33+
'tr',
34+
{ className: _style2.default.chunk },
35+
_react2.default.createElement(
36+
'td',
37+
{ className: _style2.default.nostretch },
38+
'---'
39+
),
40+
_react2.default.createElement(
41+
'td',
42+
{ className: _style2.default.nostretch },
43+
'+++'
44+
),
45+
_react2.default.createElement(
46+
'td',
47+
null,
48+
props.content
49+
)
50+
),
51+
changes
52+
);
5353
}

0 commit comments

Comments
 (0)