mirror/php-web-maker
1
0
Fork 0
mirror of https://github.com/chinchang/web-maker.git synced 2025-08-02 11:30:22 +02:00
Code Issues Releases Wiki Activity

show error in js/css editor. fixed #15

Browse Source
This commit is contained in:
Kushagra Gour
2016-11-13 16:51:42 +05:30
parent 137adf3fdc
commit 3f8bbd0f52
3 changed files with 6441 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/index.html
View File

@@ -418,6 +418,39 @@
.alerts-container.is-active { .alerts-container.is-active {
transform: translateY(0); transform: translateY(0);
} }
.error-gutter {
width: 16px;
}
.gutter-error-marker {
width: 10px;
height: 10px;
background: red;
border-radius: 50%;
position: relative;
top: 4px;
left: 3px;
}
.gutter-error-marker:after {
content: attr(data-title);
background: red;
color: white;
padding: 4px;
opacity: 0;
visibility: hidden;
position: absolute;
top: 12px;
left: 0px;
white-space: nowrap;
transform: translateX(-10px);
will-change: transform;
transition: 0.2s ease;
}
.gutter-error-marker:hover:after {
opacity: 1;
visibility: visible;
transform: translateX(0);
}
</style> </style>
</head> </head>
@@ -642,6 +675,7 @@
<script src="lib/emmet.js"></script> <script src="lib/emmet.js"></script>
<script src="lib/split.js"></script> <script src="lib/split.js"></script>
<script src="lib/esprima.js"></script>
<script src="utils.js"></script> <script src="utils.js"></script>
<script src="deferred.js"></script> <script src="deferred.js"></script>

6346
src/lib/esprima.js Normal file
View File

File diff suppressed because one or more lines are too long

67
src/script.js
View File

@@ -298,15 +298,23 @@
function computeCss() { function computeCss() {
var d = deferred(); var d = deferred();
var code = editur.cm.css.getValue(); var code = editur.cm.css.getValue();
cleanupErrors('css');
if (cssMode === CssModes.CSS) { if (cssMode === CssModes.CSS) {
d.resolve(code); d.resolve(code);
} else if (cssMode === CssModes.SCSS) { } else if (cssMode === CssModes.SCSS) {
sass.compile(code, function(result) { sass.compile(code, function(result) {
// Something as wrong
if (result.line && result.message) {
showErrors('css', [ { lineNumber: result.line - 1, message: result.message } ]);
}
d.resolve(result.text); d.resolve(result.text);
}); });
} else if (cssMode === CssModes.LESS) { } else if (cssMode === CssModes.LESS) {
less.render(code).then(function (result) { less.render(code).then(function (result) {
d.resolve(result.css); d.resolve(result.css);
}, function (error) {
showErrors('css', [ { lineNumber: error.line, message: error.message } ]);
}); });
} }
@@ -315,12 +323,38 @@
function computeJs() { function computeJs() {
var d = deferred(); var d = deferred();
var code = editur.cm.js.getValue(); var code = editur.cm.js.getValue();
cleanupErrors('js');
if (jsMode === JsModes.JS) { if (jsMode === JsModes.JS) {
d.resolve(code); try {
esprima.parse(code, {
tolerant: true
});
} catch(e) {
showErrors('js', [ { lineNumber: e.lineNumber-1, message: e.description } ]);
} finally {
d.resolve(code);
}
} else if (jsMode === JsModes.COFFEESCRIPT) { } else if (jsMode === JsModes.COFFEESCRIPT) {
d.resolve(CoffeeScript.compile(code, { bare: true })); var coffeeCode;
try {
coffeeCode = CoffeeScript.compile(code, { bare: true });
} catch (e) {
showErrors('js', [ { lineNumber: e.location.first_line, message: e.message } ]);
} finally {
d.resolve(coffeeCode);
}
} else if (jsMode === JsModes.ES6) { } else if (jsMode === JsModes.ES6) {
d.resolve(Babel.transform(editur.cm.js.getValue(), { presets: ['es2015'] }).code); try {
esprima.parse(code, {
tolerant: true
});
} catch(e) {
showErrors('js', [ { lineNumber: e.lineNumber-1, message: e.description } ]);
} finally {
d.resolve(Babel.transform(code, { presets: ['es2015'] }).code);
}
} }
return d.promise; return d.promise;
@@ -330,9 +364,24 @@
saveCode('code'); saveCode('code');
}; };
function cleanupErrors(lang) {
editur.cm[lang].clearGutter('error-gutter');
}
function showErrors(lang, errors) {
var editor = editur.cm[lang];
errors.forEach(function (e) {
editor.operation(function () {
var n = document.createElement('div');
n.setAttribute('data-title', e.message);
n.classList.add('gutter-error-marker');
editor.setGutterMarker(e.lineNumber, 'error-gutter', n);
});
});
}
function createPreviewFile(html, css, js) { function createPreviewFile(html, css, js) {
var contents = '<html>\n<head>\n' + var contents = '<html>\n<head>\n' +
'<style>\n' + css + '\n</style>\n</head>\n' + '<style>\n' + css + '\n</style>\n' +
'</head>\n' +
'<body>\n' + html + '\n<script>\n' + js + '\n</script></body>\n</html>'; '<body>\n' + html + '\n<script>\n' + js + '\n</script></body>\n</html>';
var fileWritten = false; var fileWritten = false;
@@ -351,11 +400,13 @@
} }
else { else {
fileWritten = true; fileWritten = true;
// Set the write pointer to starting of file
fileWriter.seek(0); fileWriter.seek(0);
fileWriter.write(blob); fileWriter.write(blob);
} }
} }
fileWriter.onwriteend = onWriteComplete; fileWriter.onwriteend = onWriteComplete;
// Empty the file contents
fileWriter.truncate(0) fileWriter.truncate(0)
}, errorHandler); }, errorHandler);
}, errorHandler); }, errorHandler);
@@ -410,6 +461,8 @@
tabMode: 'indent', tabMode: 'indent',
keyMap: 'sublime', keyMap: 'sublime',
theme: 'monokai', theme: 'monokai',
lint: !!options.lint,
gutters: options.gutters || [],
// cursorScrollMargin: '20', has issue with scrolling // cursorScrollMargin: '20', has issue with scrolling
profile: options.profile || '' profile: options.profile || ''
}); });
@@ -428,10 +481,12 @@
}); });
emmetCodeMirror(editur.cm.html); emmetCodeMirror(editur.cm.html);
editur.cm.css = initEditor(cssCode, { editur.cm.css = initEditor(cssCode, {
mode: 'css' mode: 'css',
gutters: [ 'error-gutter' ]
}); });
editur.cm.js = initEditor(jsCode, { editur.cm.js = initEditor(jsCode, {
mode: 'javascript' mode: 'javascript',
gutters: [ 'error-gutter' ]
}); });
function init () { function init () {