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

Load iFrame on page load

Browse Source
This commit is contained in:
Berkeley Martinez
2015-11-22 19:42:53 -08:00
parent 6f98f62dd9
commit 5a785dbad7
7 changed files with 123 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
client/commonFramework/execute-challenge-stream.js
View File

@ -84,9 +84,28 @@ window.common = (function(global) {
// add head and tail and detect loops
return Observable.just({ code: head + code + tail, original: code });
})
.map(data => {
.flatMap(data => {
if (common.challengeType === common.challengeTypes.HTML) {
return common.getScriptCode(data);
if (common.hasJs(code)) {
return common.addFaux$(data)
.flatMap(code => common.detectLoops$(code))
.flatMap(({ err }) => {
if (err) {
return Observable.throw({ err });
}
return common.runPreviewTests$({
code: data.code,
tests: common.tests.slice()
});
});
}
return common.updatePreview$(data.code)
.flatMap(code => common.runPreviewTests$({
code,
tests: common.tests.slice()
}));
}
return common.addTestsToString(Object.assign(
@ -95,21 +114,21 @@ window.common = (function(global) {
code: common.removeComments(code),
tests: common.tests.slice()
}
));
})
.flatMap(common.detectLoops$)
.flatMap(({ err, code, data, userTests, original }) => {
if (err) {
return Observable.throw({ err });
}
))
.flatMap(common.detectLoops$)
.flatMap(({ err, code, data, userTests, original }) => {
if (err) {
return Observable.throw({ err });
}
return common.runTests$({
data,
code,
userTests,
original,
output: data.output.replace(/\\\"/gi, '')
});
return common.runTests$({
data,
code,
userTests,
original,
output: data.output.replace(/\\\"/gi, '')
});
});
})
.catch(e => {
return e && e.err ?