From bd07f69a238428849de32ec6c1e7492f6c232247 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Tue, 1 Mar 2016 20:44:14 +0100 Subject: Minor cleanups around the loadProblemData function --- js/codeq/problem_list.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'js/codeq/problem_list.js') diff --git a/js/codeq/problem_list.js b/js/codeq/problem_list.js index 9c19852..268276f 100644 --- a/js/codeq/problem_list.js +++ b/js/codeq/problem_list.js @@ -384,7 +384,7 @@ along with this program. If not, see . */ }); }, - loadProblemData = function(ref, data){ + loadProblemData = function (ref, data) { var language = data.language; return codeq.wait( Q.all([ @@ -392,16 +392,18 @@ along with this program. If not, see . */ getProblemData(language, ref.g, ref.p) // the (cached) result of processProblemData() ]) .spread(function (userProblemData, generalProblemData) { - //codeq.log.debug("spread"); - if (userProblemData.code !== 0) throw new Error('Failed to obtain user problem data, code: ' + userProblemData.code + ', message: ' + userProblemData.message); - if (!generalProblemData) throw new Error('General problem data is not defined'); - //codeq.globalStateMachine.transition(language, generalProblemData, data.commonDef, userProblemData.data.solution); - return {"generalProblemData":generalProblemData,"solution":userProblemData.data.solution}; + if (userProblemData.code !== 0) { + throw new Error('Failed to obtain user problem data: ' + userProblemData.message); + } + if (!generalProblemData) { + throw new Error('General problem data is not defined.'); + } + return { + 'generalProblemData': generalProblemData, + 'solution': userProblemData.data.solution + }; }) ); - //while(!generalProblemData1){} - //return [generalProblemData1, userProblemDataSolution]; - //codeq.log.debug("after wait:"+a); }, currentLanguage; // the currently active language -- cgit v1.2.1