From 8d731d0a7d608eef11113dafe99dcbd379c1b699 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Jun 2012 12:16:38 +0200 Subject: [PATCH 1/4] fixed choisir widget ver. 2.0 --- resources/library/interactivities/Choisir.wgt/css/basic.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/library/interactivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css index 22052586..855b900e 100644 --- a/resources/library/interactivities/Choisir.wgt/css/basic.css +++ b/resources/library/interactivities/Choisir.wgt/css/basic.css @@ -363,7 +363,7 @@ body{ position: absolute; display: none; width: 100px; - height: 20px; + min-height: 20px; top: 0; left: 0; text-align: center; From 62709dee492f13cfc3c7324e328c25e57d80bc40 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Jun 2012 12:17:08 +0200 Subject: [PATCH 2/4] fixed choisir widget ver. 2.0 --- .../locales/fr/scripts/selQuestionApp.js | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js index c4a2bfe6..59919603 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/locales/fr/scripts/selQuestionApp.js @@ -37,8 +37,8 @@ var sankoreLang = { a:"R", wgt_name: "Choisir", reload: "Recharger", - slate: "Ardoise", - pad: "Tablette" + slate: "Bois", + pad: "Pad" }; @@ -75,7 +75,7 @@ function init(){ //import saved data if(window.sankore){ - if(sankore.preference("qstArrayData","")){ + if(sankore.preference("qstArrayData","") && sankore.preference("qstArrayData","") != "[]"){ questionArray = jQuery.parseJSON(sankore.preference("qstArrayData","")); for(var i in questionArray){ addQstBlock(questionArray[i].id, questionArray[i].text, questionArray[i].type,"style='display: none;'"); @@ -114,6 +114,8 @@ function init(){ $("#wgt_edit").css("display", "block"); displayData(true); mode = true; + sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); + sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); } } else { if(!$(this).hasClass("selected")){ @@ -129,7 +131,10 @@ function init(){ }); $("#wgt_reload").text(sankoreLang.reload).click(function(){ - window.location.reload(); + if($("#wgt_edit").css("display") == "none") + $("#wgt_display").trigger("click"); + else + window.location.reload(); }); $(".style_select option[value='1']").text(sankoreLang.slate); @@ -225,7 +230,13 @@ function init(){ questionArray[i].rightAns = questionArray[i].rightAns.replace($("#" + currentQstId + " #" + id + " input:checkbox").val(),""); for(var j in questionArray[i].answers) if(questionArray[i].answers[j].id == id){ - delete questionArray[i].answers[j]; + if(j == 0) + questionArray[i].answers.shift(); + else + if((j+1) == questionArray[i].answers.length) + questionArray[i].answers.pop(); + else + questionArray[i].answers = questionArray[i].answers.slice(0,j).concat(questionArray[i].answers.slice(j+1)); break; } } @@ -238,7 +249,13 @@ function init(){ $("#" + currentQstId).remove(); for(var i in questionArray) if(questionArray[i].id == currentQstId){ - delete questionArray[i]; + if(i == 0) + questionArray.shift(); + else + if((i+1) == questionArray.length) + questionArray.pop(); + else + questionArray = questionArray.slice(0,i).concat(questionArray.slice(i+1)); break; } refreshQst(); From 9a32e325501fd60ce1e95f75992c280d412ec79b Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Jun 2012 12:17:28 +0200 Subject: [PATCH 3/4] fixed choisir widget ver. 2.0 --- .../locales/ru/scripts/selQuestionApp.js | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js index 2dd4969e..2e919355 100644 --- a/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/locales/ru/scripts/selQuestionApp.js @@ -75,7 +75,7 @@ function init(){ //import saved data if(window.sankore){ - if(sankore.preference("qstArrayData","")){ + if(sankore.preference("qstArrayData","") && sankore.preference("qstArrayData","") != "[]"){ questionArray = jQuery.parseJSON(sankore.preference("qstArrayData","")); for(var i in questionArray){ addQstBlock(questionArray[i].id, questionArray[i].text, questionArray[i].type,"style='display: none;'"); @@ -114,6 +114,8 @@ function init(){ $("#wgt_edit").css("display", "block"); displayData(true); mode = true; + sankore.setPreference("qstArrayData", JSON.stringify(questionArray)); + sankore.setPreference("choisir_style", $(".style_select").find("option:selected").val()); } } else { if(!$(this).hasClass("selected")){ @@ -129,7 +131,10 @@ function init(){ }); $("#wgt_reload").text(sankoreLang.reload).click(function(){ - window.location.reload(); + if($("#wgt_edit").css("display") == "none") + $("#wgt_display").trigger("click"); + else + window.location.reload(); }); $(".style_select option[value='1']").text(sankoreLang.slate); @@ -225,7 +230,13 @@ function init(){ questionArray[i].rightAns = questionArray[i].rightAns.replace($("#" + currentQstId + " #" + id + " input:checkbox").val(),""); for(var j in questionArray[i].answers) if(questionArray[i].answers[j].id == id){ - delete questionArray[i].answers[j]; + if(j == 0) + questionArray[i].answers.shift(); + else + if((j+1) == questionArray[i].answers.length) + questionArray[i].answers.pop(); + else + questionArray[i].answers = questionArray[i].answers.slice(0,j).concat(questionArray[i].answers.slice(j+1)); break; } } @@ -238,7 +249,13 @@ function init(){ $("#" + currentQstId).remove(); for(var i in questionArray) if(questionArray[i].id == currentQstId){ - delete questionArray[i]; + if(i == 0) + questionArray.shift(); + else + if((i+1) == questionArray.length) + questionArray.pop(); + else + questionArray = questionArray.slice(0,i).concat(questionArray.slice(i+1)); break; } refreshQst(); From 7837d0aa6be58d70671f992947b0e280089b361f Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 13 Jun 2012 12:17:40 +0200 Subject: [PATCH 4/4] fixed choisir widget ver. 2.0 --- .../interactivities/Choisir.wgt/scripts/selQuestionApp.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js index 1b638e73..542c38e8 100644 --- a/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js +++ b/resources/library/interactivities/Choisir.wgt/scripts/selQuestionApp.js @@ -131,12 +131,6 @@ function init(){ }); $("#wgt_reload").text(sankoreLang.reload).click(function(){ - //window.location.reload(); - // if(!sankore.preference("qstArrayData","") || sankore.preference("qstArrayData","") == "[]" || sankore.preference("qstArrayData","") == "[null]"){ - // $(".qstDivDisplay").remove(); - // displayData(false); - // } - // else if($("#wgt_edit").css("display") == "none") $("#wgt_display").trigger("click"); else