mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-07-28 09:10:17 +02:00
Code Issues Releases Wiki Activity

merge master and resolve conflicts

Browse Source
This commit is contained in:
Kushagra Gour
2018-11-17 01:19:32 +05:30
parent 17850a15a4 b006b4849e
commit 21d44bf9f6
29 changed files with 61684 additions and 1790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/ContentWrap.jsx
View File

@@ -230,8 +230,7 @@ export default class ContentWrap extends Component {
if (targetFrame.contentDocument.querySelector('#webmakerstyle')) {
targetFrame.contentDocument.querySelector(
'#webmakerstyle'
).textContent =
result.code || '';
).textContent = result.code || '';
}
});
} else {
@@ -716,6 +715,8 @@ export default class ContentWrap extends Component {
gutters: ['CodeMirror-linenumbers', 'CodeMirror-foldgutter'],
noAutocomplete: true,
matchTags: { bothTags: true },
prettier: true,
prettierParser: 'html',
emmet: true
}}
prefs={this.props.prefs}