http://www.mediawiki.org/wiki/Special:Code/MediaWiki/96676

Revision: 96676
Author:   jeroendedauw
Date:     2011-09-09 18:11:29 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
fixed select and radio controls in survey

Modified Paths:
--------------
    trunk/extensions/Survey/resources/ext.survey.js
    trunk/extensions/Survey/resources/jquery.survey.js

Modified: trunk/extensions/Survey/resources/ext.survey.js
===================================================================
--- trunk/extensions/Survey/resources/ext.survey.js     2011-09-09 18:01:13 UTC 
(rev 96675)
+++ trunk/extensions/Survey/resources/ext.survey.js     2011-09-09 18:11:29 UTC 
(rev 96676)
@@ -59,14 +59,18 @@
                $radio.html( '' );
                
                for ( message in options ) {
-                       var value = options[message];
-                       var id = name + value;
+                       var itemValue = options[message];
+                       var id = name + itemValue;
                        
+//                     if ( value === null ) {
+//                             value = itemValue;
+//                     }
+                       
                        $input = $( '<input />' ).attr( {
                                'id': id,
                                'type': 'radio',
                                'name': name,
-                               'value': value
+                               'value': itemValue
                        } );
                        
                        if ( value === options[message] ) {

Modified: trunk/extensions/Survey/resources/jquery.survey.js
===================================================================
--- trunk/extensions/Survey/resources/jquery.survey.js  2011-09-09 18:01:13 UTC 
(rev 96675)
+++ trunk/extensions/Survey/resources/jquery.survey.js  2011-09-09 18:11:29 UTC 
(rev 96676)
@@ -66,15 +66,27 @@
                                } );
                                break;
                        case type.SELECT:
-                               $input = survey.htmlSelect( question.answers, 
0, { 
+                               var answers = {};
+                               
+                               for ( i in question.answers ) {
+                                       answers[question.answers[i]] = 
question.answers[i]; 
+                               }
+                               
+                               $input = survey.htmlSelect( answers, 0, { 
                                        'id': id,
                                        'class': 'survey-question survey-select'
                                } );
                                break;
                        case type.RADIO:
+                               var answers = {};
+                               
+                               for ( i in question.answers ) {
+                                       answers[question.answers[i]] = 
question.answers[i]; 
+                               }
+                               
                                $input = survey.htmlRadio(
-                                       question.answers,
-                                       0,
+                                       answers,
+                                       null,
                                        id,
                                        {
                                                'id': id,


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to