Reimplemented language selection with simple links. Removed unused startup.js, moved the boot sequence to core.js.

1 files changed, 14 insertions, 20 deletions

diff --git a/js/codeq/language.js b/js/codeq/language.js
index d4b6ee4..be2a319 100644
--- a/js/codeq/language.js
+++ b/js/codeq/language.js
@@ -3,34 +3,28 @@
  */
 
 (function(){
+    var jqScreen = $('#screen_language'),
+        jqProlog = $('#choose-prolog'),
+        jqPython = $('#choose-python'),
+        chooseProlog = function () {codeq.globalStateMachine.transition('problem', 'prolog');},
+        choosePython = function () {codeq.globalStateMachine.transition('problem', 'python');};
+
     codeq.globalStateMachine.register('language',{
         'enter': function(){
-            $('#submit_language').on('click',function(){
-                codeq.globalStateMachine.transition('problem',$('#language').val());
-                //var lan = $('#language').val();
-                //codeq.activateState('problem',{'lan':lan});
-            });
-
             $('#navigation-login').css('display', '');
-            /*$('#navigation-login').on('click', function(){
-               codeq.globalStateMachine.transition('login');
-               //codeq.activateState('login');
-            });*/
-            $("#navigation-language").addClass("active");
-            $('#navigation-language').css('display', '');
+            $("#navigation-language").addClass("active").css('display', '');
 
-            $("#screen_language").css('display', '');
+            jqScreen.css('display', '');
+            jqProlog.on('click', chooseProlog);
+            jqPython.on('click', choosePython);
         },
         'exit' : function(){
-            $("#submit_language").off();
-            $("#screen_language").css('display', 'none');
+            jqProlog.off();
+            jqPython.off();
+            jqScreen.css('display', 'none');
 
             $('#navigation-login').css('display', 'none');
-            //$('#navigation-login').off();
-            $('#navigation-language').css('display', 'none');
-            $("#navigation-language").removeClass("active");
-
-            $('#language').val("prolog");//reset to the default value
+            $('#navigation-language').css('display', 'none').removeClass("active");
         }
     });
 })();
\ No newline at end of file