summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-11-19 10:34:12 +0100
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2015-11-19 10:34:12 +0100
commitdf1704ef911847d4e390d1cde0cc80c35a19cbbe (patch)
treee13c73eb570ff0ce78b59b4875a1f189d1fd1390
parenta184ad0a8a36c94669b6e07c311f4177a38edb63 (diff)
Use preventDefault instead of return false for link events
-rw-r--r--js/codeq/language.js7
-rw-r--r--js/codeq/problem_list.js6
2 files changed, 6 insertions, 7 deletions
diff --git a/js/codeq/language.js b/js/codeq/language.js
index e86b09e..97691e6 100644
--- a/js/codeq/language.js
+++ b/js/codeq/language.js
@@ -9,15 +9,14 @@
jqRobot = $('#choose-robot'),
choose = function (language) {
codeq.globalStateMachine.transition('problem_list', language);
- return false;
};
codeq.globalStateMachine.register('language',{
'enter': function(){
jqScreen.css('display', '');
- jqProlog.on('click', function () { return choose('prolog') });
- jqPython.on('click', function () { return choose('python') });
- jqRobot.on('click', function () { return choose('robot') });
+ jqProlog.on('click', function (e) { e.preventDefault(); choose('prolog') });
+ jqPython.on('click', function (e) { e.preventDefault(); choose('python') });
+ jqRobot.on('click', function (e) { e.preventDefault(); choose('robot') });
},
'exit' : function(){
jqProlog.off();
diff --git a/js/codeq/problem_list.js b/js/codeq/problem_list.js
index cc9e716..3fb9653 100644
--- a/js/codeq/problem_list.js
+++ b/js/codeq/problem_list.js
@@ -251,12 +251,13 @@
var language = data.language;
jqScreen.html(data.html);
codeq.tr.translateDom(jqScreen);
- jqScreen.find('a').on('click', function () {
+ jqScreen.find('a').on('click', function (e) {
var index = +$(this).attr('class').split(' ')[0].split('-')[1],
ref = data.refs[index];
+ e.preventDefault();
if (!ref) {
codeq.log.error('Clicked on a problem link having erroneous index: ' + index);
- return false;
+ return;
}
codeq.wait(
Q.all([
@@ -274,7 +275,6 @@
alert('Failed to obtain the problem definition: ' + reason);
})
.done();
- return false;
});
},