Fixed issue: Multiple option with checkbox : Other can be checked at …

…submit with empty value Dev: add blur at onkeyup function : tested in IE6/FF14 Dev: close issue #6467 : checkbox for 'other' missing for multiple choice : updating javascript Dev: use visibility:hidden in citronade and some other fix
LimeSurvey · Aug 12, 2012 · 50624c0 · 50624c0
1 parent 8bed9d6
commit 50624c0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -2425,7 +2425,13 @@ function do_multiplechoice($ia)
             }
             $answer .= htmlspecialchars($dispVal,ENT_QUOTES);
         }
-        $answer .= "\" onkeyup='if ($.trim(this.value)!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"checked\"); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"\"); }; $(\"#java{$myfname}\").val(this.value);$oth_checkconditionFunction(this.value, this.name, this.type); LEMflagMandOther(\"$myfname\",\$(\"#answer{$myfname}cbox\").attr(\"checked\"));'/>";
+#        $answer .= "\" onkeyup='if ($.trim(this.value)!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"checked\"); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"\"); }; $(\"#java{$myfname}\").val(this.value);$oth_checkconditionFunction(this.value, this.name, this.type); LEMflagMandOther(\"$myfname\",\$(\"#answer{$myfname}cbox\").attr(\"checked\"));'/>";
+        $answer .="\" />";
+        $answer .="<script type='text/javascript'>\n";
+        $answer .="$('#answer{$myfname}').bind('keyup blur',function(){\n";
+        $answer .= " if ($.trim($(this).val())!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",true); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",false); }; $(\"#java{$myfname}\").val($(this).val());$oth_checkconditionFunction(this.value, this.name, this.type); LEMflagMandOther(\"$myfname\",\$(\"#answer{$myfname}cbox\").attr(\"checked\"));\n";
+        $answer .="});\n";
+        $answer .="</script>\n";
         $answer .= '<input type="hidden" name="java'.$myfname.'" id="java'.$myfname.'" value="';
 
         //        if ($maxansw > 0)

diff --git a/templates/citronade/template.css b/templates/citronade/template.css
@@ -359,8 +359,7 @@ input[type="text"].tip,input.tip,input.tip{border:0;background:transparent}
 .form input[type=text],input.text,.answers-wrapper input.text,.answers-wrapper textarea, .answers-wrapper input[type=text]
 	{border:1px solid #999;-moz-border-radius: 3px;-webkit-border-radius: 3px;border-radius:3px;}
 
-
-.mandatory .answers-wrapper textarea.empty,.mandatory  .answers-wrapper input[type=text].empty,
+.mandatory .answers-wrapper .text-item textarea.empty,.mandatory .answers-wrapper .text-item input[type=text].empty,
 .answers-wrapper textarea.error, .answers-wrapper input[type=text].error{
 	border:1px solid #944;color:#444;background-color:#FEF;
 }
@@ -372,16 +371,17 @@ input[type="text"].tip,input.tip,input.tip{border:0;background:transparent}
 	border:1px solid #494;color:#444
 }
 .other .answers-wrapper textarea.good,.other .answers-wrapper input[type=text].good{
-	border:1px solid #999;color:#444
+	border:1px solid #494;color:#444
 }
 .answers-wrapper textarea.empty, .answers-wrapper input[type=text].empty{
 	border:1px solid #999;color:#444;background-color:#FFF;
 }
-.answers-wrapper textarea[disabled], .answers-wrapper input.text[disabled], .answers-wrapper input[type=text][disabled]{
-  background-color:#FFF;border-color:#EEE;
-}
-.answers-wrapper textarea.empty[disabled], .answers-wrapper input[type=text].empty[disabled]{
-	border:1px solid #EEE;color:#444;background-color:#FFF;
+  .answers-wrapper textarea[disabled], .answers-wrapper input.text[disabled], .answers-wrapper input[type=text][disabled]
+, .answers-wrapper input.text.good[disabled], .answers-wrapper input.good[type=text][disabled]
+, .answers-wrapper input.text.error[disabled], .answers-wrapper input.error[type=text][disabled]
+, .answers-wrapper textarea.empty[disabled], .answers-wrapper input[type=text].empty[disabled]
+{
+  background-color:#FFF;border-color:#EEE;color:#EEE;
 }
 
 .form input[type=text]:focus,input.text:focus,.answers-wrapper textarea:focus, .answers-wrapper input.text:focus, .answers-wrapper input[type=text]:focus{
@@ -391,6 +391,9 @@ input[type="text"].tip,input.tip,input.tip{border:0;background:transparent}
   box-shadow: 1px 1px 3px #555;
 }
 
+.answers-wrapper input.checkbox[disabled],.answers-wrapper input.radio[disabled]{
+  opacity:0.3;
+}
 /* specific questions color and background*/
 table.question{border-color:#D5DBE7;}
 table.question tbody{border-color:#D5DBE7;}
@@ -718,7 +721,7 @@ table.rank input{border:1px solid #999}
 {
 	margin-left:-30px;vertical-align: middle;
 }
-.multiple-opt .answers-wrapper ul li input.other-checkbox
+.multiple-opt .answers-wrapper ul li.other-item input.checkbox
 {
 	visibility:hidden;
 }