diff options
author | Robert Zorko <robertz@gurucue.com> | 2015-09-18 18:54:32 +0200 |
---|---|---|
committer | Robert Zorko <robertz@gurucue.com> | 2015-09-18 18:54:32 +0200 |
commit | d1445d6af226de21ecf513ff7aff7d6f7bb82b1c (patch) | |
tree | 7a448edac2d6b66feb8979e97ccd7e4ba5e3f6d3 /js/codeq/python.js | |
parent | 9113815d16d38373b378c6d34000a75f019b219f (diff) | |
parent | 5ae5ffc6e86a0181799b6f45167bfb57ea91a32c (diff) |
merge conflict occured and is now fixed
Diffstat (limited to 'js/codeq/python.js')
-rw-r--r-- | js/codeq/python.js | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/js/codeq/python.js b/js/codeq/python.js index e856c08..c5f7df6 100644 --- a/js/codeq/python.js +++ b/js/codeq/python.js @@ -97,9 +97,11 @@ * add the above function to the buttons */ addClickListenerTranstions = function(){ + $('#btn_code_plan').on('click',clickListenerTransitionFun); $('#btn_code_hint').on('click',clickListenerTransitionFun); $('#btn_code_test').on('click',clickListenerTransitionFun); + $('#btn_code_plan').on(transitionEventName,mouseDownEventIgnoreFun); $('#btn_code_hint').on(transitionEventName,mouseDownEventIgnoreFun); $('#btn_code_test').on(transitionEventName,mouseDownEventIgnoreFun); }, @@ -107,9 +109,11 @@ * and a function to remove it */ removeClickListenerTransition = function(){ + $('#btn_code_plan').off('click',clickListenerTransitionFun); $('#btn_code_hint').off('click',clickListenerTransitionFun); $('#btn_code_test').off('click',clickListenerTransitionFun); + $('#btn_code_plan').off(transitionEventName,mouseDownEventIgnoreFun); $('#btn_code_hint').off(transitionEventName,mouseDownEventIgnoreFun); $('#btn_code_test').off(transitionEventName,mouseDownEventIgnoreFun); }, @@ -221,7 +225,8 @@ var makePythonTerminalHandler = function (jqConsole, editor, problem_id, activityHandler) { var terminal = codeq.makeConsole(jqConsole, { - 'greeting': 'CodeQ Python terminal proxy' + 'greeting': 'CodeQ Python terminal proxy', + 'autoHistory': true }), tcs = function terminalCommandSuccess (data) { if (data.code !== 0) { @@ -312,11 +317,12 @@ editor = CodeMirror(jqEditor[0], { cursorHeight: 0.85, lineNumbers: true, matchBrackets: true, mode: 'python' }), activityHandler = makeActivityHandler(editor, problem.id), terminal = makePythonTerminalHandler(jqConsole, editor, problem.id, activityHandler), - hinter = codeq.makeHinter(jqHints, jqEditor, editor, problem.hint); + hinter = codeq.makeHinter(jqHints, jqEditor, editor, problem.hint, problem.plan); editor.setValue(info.solution); $('#title').text(problem.slug); jqDescription.html(problem.description); + $('#btn_code_plan').prop('disabled', (problem.plan || '').length == 0); editor.on('change', function (instance, changeObj) { var doc = editor.getDoc(), @@ -331,6 +337,12 @@ } }); + $('#btn_code_plan').on('click', function () { + if (!hinter.planNext()) { + $('#btn_code_plan').prop('disabled', true); + $('#btn_code_plan').blur(); + } + }); $('#btn_code_hint').on('click', function () { var doc = editor.getDoc(); codeq.comms.sendHint({ |