merge conflict occured and is now fixed

1 files changed, 15 insertions, 3 deletions

diff --git a/js/codeq/prolog.js b/js/codeq/prolog.js
index 96c3077..e411bc4 100644
--- a/js/codeq/prolog.js
+++ b/js/codeq/prolog.js
@@ -95,9 +95,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);
         },
@@ -105,9 +107,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);
         },
@@ -223,7 +227,8 @@
         var promptMode = true, // default: query composition; alternative: query result browsing
             manualStop = false,// if the user stopped showing next answers (false) or if there are no more answers (true)
             terminal = codeq.makeConsole(jqConsole, {
-                'greeting': 'CodeQ Prolog terminal proxy'
+                'greeting': 'CodeQ Prolog terminal proxy',
+                'autoHistory': true
             }),
             tcs = function terminalCommandSuccess (data) {
                 var t, lines, i;
@@ -362,11 +367,12 @@
             editor = CodeMirror(jqEditor[0], { cursorHeight: 0.85, lineNumbers: true, matchBrackets: true }),
             activityHandler = makeActivityHandler(editor, problem.id),
             terminal = makePrologTerminalHandler(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(),
@@ -381,6 +387,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 () {
             terminal.append('hint.\n', 'input');
             terminal.inputDisable();
@@ -451,4 +463,4 @@
             }
         };
     };
-})();
\ No newline at end of file
+})();