gsadmin/gitbook
1
0
Fork 0
mirror of https://github.com/GitbookIO/gitbook.git synced 2026-09-21 01:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix execution when contains &&

Browse Source
This commit is contained in:
Samy Pessé
2014-04-01 18:21:01 -07:00
parent 835953d8dd
commit 466ceb581c
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/javascript/core/exercise.js
+2 -2
View File
@@ -6,8 +6,8 @@ define([
], function($, execute, analytic, state){
// Bind an exercise
var prepareExercise = function($exercise) {
var codeSolution = $exercise.find(".code-solution").html();
var codeValidation = $exercise.find(".code-validation").html();
var codeSolution = $exercise.find(".code-solution").text();
var codeValidation = $exercise.find(".code-validation").text();
var editor = ace.edit($exercise.find(".editor").get(0));
editor.setTheme("ace/theme/tomorrow");
assets/javascript/utils/execute.js
+3 -8
View File
@@ -65,17 +65,12 @@ define(function(){
};
var ass = "function assert(condition, message) { \nif (!condition) { \n throw message || \"Assertion failed\"; \n } \n }\n";
var code = {
"base": "var firstName = \"John\";\nvar middleName = \"James\";\nvar lastName = \"Smith\";\n\nvar fullName =",
"solution": "var firstName = \"John\";\nvar middleName = \"James\";\nvar lastName = \"Smith\";\n\nvar fullName = firstName + \" \" + middleName + \" \" + lastName;",
"validation": "console.log(fullName); assert(fullName == 'John James Smith');"
};
var ass = "function assert(condition, message) { \nif (!condition) { \n throw message || \"Assertion failed\"; \n } \n }\n";
var execute = function(solution, validation, callback) {
// Validate with validation code
evalJS([solution, ass, validation].join(";\n"), function(err, res) {
var code = [solution, ass, validation].join(";\n");
evalJS(code, function(err, res) {
if(err) return callback(err);
if (res.type == "error") callback(new Error(res.value));