diff options
Diffstat (limited to 'js/prolog.js')
| -rw-r--r-- | js/prolog.js | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/js/prolog.js b/js/prolog.js index 0a0eb48..50b9176 100644 --- a/js/prolog.js +++ b/js/prolog.js @@ -6,7 +6,7 @@ // a constant var firstCharacterPos = {'line': 0, 'ch': 0}; - var makePrologTerminalHandler = function (jqConsole, editor, problem_group, problem) { + var makePrologTerminalHandler = function (jqConsole, editor, problem_id) { var promptMode = true, // default: query composition; alternative: query result browsing tcs = function terminalCommandSuccess (data) { var t, lines, i; @@ -36,9 +36,10 @@ 'step': 'run', 'program': editor.getDoc().getValue(), 'query': command, - 'language': 'prolog', - 'problem_group': problem_group, - 'problem': problem +// 'language': 'prolog', +// 'problem_group': problem_group, +// 'problem': problem + 'problem_id': problem_id }).then(tcs, tcf).done(); } else { @@ -85,8 +86,9 @@ * @param {PrologTaskDef} info * @returns {{destroy: Function, processServerHints: Function}} */ - codeq.createPrologHandler = function (info, problem_group, problem) { - var jqDescription = $('#description'), + codeq.createPrologHandler = function (info) { + var problem = info.problem, + jqDescription = $('#description'), jqEditor = $('#code_editor'), jqConsole = $('#console'), jqHints = $('#info'), @@ -104,9 +106,9 @@ promptHistory: false, welcomeMessage: 'Prolog REPL.' }),*/ - terminal = makePrologTerminalHandler(jqConsole, editor, problem_group, problem), + terminal = makePrologTerminalHandler(jqConsole, editor, problem.id), /** Object.<string, HintDefinition> */ - hintDefs = info.hint, + hintDefs = problem.hint, hintCounter = 0, // for generating unique class-names hintCleaners = [], clearHints = function () { @@ -218,8 +220,9 @@ return dt; }; - editor.setValue('sister(X, Y) :-\n female(X),\n parent(Z, X),\n parent(Z, Y),\n X \\== Y.'); // demo - jqDescription.html(info.description); + editor.setValue(info.solution); + $('#title').text(problem.slug); + jqDescription.html(problem.description); editor.on('change', function (instance, changeObj) { var doc = editor.getDoc(), @@ -297,13 +300,13 @@ var doc = editor.getDoc(), dt = deltaActivityMillis(); // codeq.comms.sendActivity({'typ': 'slv', 'dt': dt, 'qry': }); - handler.processServerHints([{id:'list_empty'}]); +// handler.processServerHints([{id:'list_empty'}]); }); $('#btn_code_break').on('click', function () { - handler.processServerHints([{id:'popup_unknown', start: 20, end: 26}]); +// handler.processServerHints([{id:'popup_unknown', start: 20, end: 26}]); }); $('#btn_code_hint').on('click', function () { - handler.processServerHints([{id:'drop_down', start: 20, end: 26, choices:['ena', 'dva', 'tri']}]); +// handler.processServerHints([{id:'drop_down', start: 20, end: 26, choices:['ena', 'dva', 'tri']}]); }); return handler; |