gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix errors breaking pipe

Browse Source
This commit is contained in:
Berkeley Martinez
2015-11-24 16:03:11 -08:00
parent 7592131e08
commit 28e4252a00
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
client/commonFramework/end.js
View File

@ -35,16 +35,21 @@ $(document).ready(function() {
.flatMap(code => common.detectLoops$(code)) .flatMap(code => common.detectLoops$(code))
.flatMap( .flatMap(
({ err }) => err ? Observable.throw(err) : Observable.just(code) ({ err }) => err ? Observable.throw(err) : Observable.just(code)
); )
.flatMap(code => common.updatePreview$(code))
.catch(err => Observable.just({ err }));
} }
return Observable.just(code); return Observable.just(code)
.flatMap(code => common.updatePreview$(code))
.catch(err => Observable.just({ err }));
}) })
.flatMap(code => common.updatePreview$(code))
.catch(err => Observable.just({ err }))
.subscribe( .subscribe(
({ err }) => { ({ err }) => {
if (err) { if (err) {
return console.error(err); console.error(err);
return common.updatePreview$(`
<h1>${err}</h1>
`).subscribe(() => {});
} }
}, },
err => console.error(err) err => console.error(err)
@ -57,15 +62,20 @@ $(document).ready(function() {
common.editor.setValue(common.replaceSafeTags(common.seed)); common.editor.setValue(common.replaceSafeTags(common.seed));
}) })
.flatMap(() => { .flatMap(() => {
return common.executeChallenge$(); return common.executeChallenge$()
.catch(err => Observable.just({ err }));
}) })
.subscribe( .subscribe(
({ output, original }) => { ({ err, output, original }) => {
if (err) {
console.error(err);
return common.updateOutputDisplay('' + err);
}
common.codeStorage.updateStorage(challengeName, original); common.codeStorage.updateStorage(challengeName, original);
common.updateOutputDisplay('' + output); common.updateOutputDisplay('' + output);
}, },
({ err }) => { (err) => {
if (err.stack) { if (err) {
console.error(err); console.error(err);
} }
common.updateOutputDisplay('' + err); common.updateOutputDisplay('' + err);
@ -83,7 +93,7 @@ $(document).ready(function() {
const solved = tests.every(test => !test.err); const solved = tests.every(test => !test.err);
return { ...rest, tests, solved }; return { ...rest, tests, solved };
}) })
.catch(err => Observable.just(err)); .catch(err => Observable.just({ err }));
}) })
.subscribe( .subscribe(
({ err, solved, output, tests }) => { ({ err, solved, output, tests }) => {