https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113896
Revision: 113896
Author: wikinaut
Date: 2012-03-15 07:46:55 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
code cosmetics. jquery improvements.
Modified Paths:
--------------
trunk/extensions/AJAXPoll/AJAXPoll.php
trunk/extensions/AJAXPoll/AJAXPoll_body.php
Modified: trunk/extensions/AJAXPoll/AJAXPoll.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-15 06:44:25 UTC (rev
113895)
+++ trunk/extensions/AJAXPoll/AJAXPoll.php 2012-03-15 07:46:55 UTC (rev
113896)
@@ -19,7 +19,7 @@
* @author Jack Phoenix <[email protected]>
* @author Thomas Gries
* @maintainer Thomas Gries
- * @version 1.73
+ * @version 1.74
* @link http://www.mediawiki.org/wiki/Extension:AJAX_Poll Documentation
*/
@@ -31,7 +31,7 @@
$wgExtensionCredits['parserhook'][] = array(
'path' => __FILE__,
'name' => 'AJAX Poll',
- 'version' => '1.73 20120314',
+ 'version' => '1.74 20120315',
'author' => array( 'Dariusz Siedlecki', 'Jack Phoenix', 'Thomas Gries'
),
'descriptionmsg' => 'ajaxpoll-desc',
'url' => 'https://www.mediawiki.org/wiki/Extension:AJAX_Poll',
Modified: trunk/extensions/AJAXPoll/AJAXPoll_body.php
===================================================================
--- trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-15 06:44:25 UTC (rev
113895)
+++ trunk/extensions/AJAXPoll/AJAXPoll_body.php 2012-03-15 07:46:55 UTC (rev
113896)
@@ -321,11 +321,14 @@
for ( $i = 1; $i < count( $lines ); $i++ ) {
$vote = !( $canRevoke && ( $i == count( $lines
) - 1 ) );
- $voteValue = ( $vote ) ? $i : 0;
- $ans_no = $i - 1;
- $xid = "$id-$ans_no";
+ // answers are counted from 1 ... n
+ // last answer is pseudo-answer for "I want to
revoke vote"
+ // and becomes answer number 0
+ $answer = ( $vote ) ? $i : 0;
+ $xid = $id . "-" . $answer;
+
if ( $amountOfVotes == 0 ) {
$percent = 0;
} else {
@@ -341,7 +344,7 @@
if ( $wgUser->isAllowed( 'ajaxpoll-vote' ) ) {
if ( $wgUseAjax ) {
- $submitJS =
"sajax_do_call(\"AJAXPoll::submitVote\",[\"" . $id . "\",\"" . $voteValue .
"\"],$(\"#ajaxpoll-container-" . $id . "\")[0]);";
+ $submitJS =
"sajax_do_call(\"AJAXPoll::submitVote\",[\"" . $id . "\",\"" . $answer .
"\"],$(\"#ajaxpoll-container-" . $id . "\")[0]);";
} else {
$submitJS =
"$(\"#ajaxpoll-answer-id-" . $id . "\").submit();";
}
@@ -352,13 +355,13 @@
if ( $vote ) {
$ret .= "
-<div id='ajaxpoll-answer-$xid' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name'><label for='ajaxpoll-post-answer-$xid'
onclick='$(\"#ajaxpoll-ajax-" . $id . "\").html(\"" . wfMsg(
'ajaxpoll-submitting' ) . "\");$(\"#ajaxpoll-ajax-" . $id .
"\").css(\"display\",\"block\");$(this).addClass(\"ajaxpoll-checkevent\").prop(\"checked\",true);
" . $submitJS . "'><input type='radio' id='ajaxpoll-post-answer-$xid'
name='ajaxpoll-post-answer-$xid' value='" . $voteValue . "' " . ( $our ?
'checked=true ' : '' ) . "/>" . strip_tags( $lines[$i] ) .
+<div id='ajaxpoll-answer-$xid' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name'><label for='ajaxpoll-post-answer-$xid'
onclick='$(\"#ajaxpoll-ajax-" . $xid . "\").html(\"" . wfMsg(
'ajaxpoll-submitting' ) .
"\").css(\"display\",\"block\");$(this).addClass(\"ajaxpoll-checkevent\").prop(\"checked\",true);"
. $submitJS . "'><input type='radio' id='ajaxpoll-post-answer-$xid'
name='ajaxpoll-post-answer-$xid' value='" . $answer . "' " . ( $our ?
'checked=true ' : '' ) . "/>" . strip_tags( $lines[$i] ) .
"</label></div><div class='ajaxpoll-answer-vote" . ( $our ? '
ajaxpoll-our-vote' : '' ) ."'><span title='" . wfMsg( 'ajaxpoll-percent-votes',
sprintf( $percent ) ) . "'>" . ( ( isset( $poll_result ) && !empty(
$poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 ) . "</span><div
style='width: " . $percent . "%;" . ( $percent == 0 ? ' border:0;' : '' ) .
"'></div></div>
</div>
";
} else {
$ret .= "
-<div id='ajaxpoll-answer-$xid' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name ajaxpoll-answer-name-revoke'><label
for='ajaxpoll-post-answer-$xid' onclick='$(\"#ajaxpoll-ajax-" . $id .
"\").html(\"" . wfMsg( 'ajaxpoll-submitting' ) . "\");$(\"#ajaxpoll-ajax-" .
$id .
"\").css(\"display\",\"block\");$(this).addClass(\"ajaxpoll-checkevent\").prop(\"checked\",true);
" . $submitJS . "'><input type='radio' id='ajaxpoll-post-answer-$xid'
name='ajaxpoll-post-answer-$xid' value='" . $voteValue . "' " . ( $our ?
'checked=true ' : '' ) . "/>" . strip_tags( $lines[$i] ) .
+<div id='ajaxpoll-answer-$xid' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name ajaxpoll-answer-name-revoke'><label
for='ajaxpoll-post-answer-$xid' onclick='$(\"#ajaxpoll-ajax-" . $xid .
"\").html(\"" . wfMsg( 'ajaxpoll-submitting' ) .
"\").css(\"display\",\"block\");$(this).addClass(\"ajaxpoll-checkevent\").prop(\"checked\",true);"
. $submitJS . "'><input type='radio' id='ajaxpoll-post-answer-$xid'
name='ajaxpoll-post-answer-$xid' value='" . $answer . "' " . ( $our ?
'checked=true ' : '' ) . "/>" . strip_tags( $lines[$i] ) .
"</label></div>
</div>
";
@@ -367,7 +370,7 @@
} else {
$ret .= "
-<div id='ajaxpoll-answer-" . $id . "' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name'><label for='ajaxpoll-post-answer-" . $id . "'
onclick='$(\"#ajaxpoll-ajax-" . $id . "\").html(\"" . wfMsg(
'ajaxpoll-vote-permission' ) . "\");$(\"#ajaxpoll-ajax-" . $id .
"\").css(\"display\",\"block\");'><input disabled='disabled' type='radio'
id='ajaxpoll-post-answer-" . $id . "' name='ajaxpoll-post-answer-" . $id . "'
value='" . $voteValue . "'/>" . strip_tags( $lines[$i] ) .
+<div id='ajaxpoll-answer-" . $xid . "' class='ajaxpoll-answer'><div
class='ajaxpoll-answer-name'><label for='ajaxpoll-post-answer-" . $xid . "'
onclick='$(\"#ajaxpoll-ajax-" . $xid . "\").html(\"" . wfMsg(
'ajaxpoll-vote-permission' ) . "\").css(\"display\",\"block\");'><input
disabled='disabled' type='radio' id='ajaxpoll-post-answer-" . $xid . "'
name='ajaxpoll-post-answer-" . $xid . "' value='" . $answer . "'/>" .
strip_tags( $lines[$i] ) .
"</label></div><div class='ajaxpoll-answer-vote" . ( $our ? '
ajaxpoll-our-vote' : '' ) ."'><span title='" . wfMsg( 'ajaxpoll-percent-votes',
sprintf( $percent ) ) . "'>" . ( ( isset( $poll_result ) && !empty(
$poll_result[$i + 1] ) ) ? $poll_result[$i + 1] : 0 ) . "</span><div
style='width: " . $percent . "%;" . ( $percent == 0 ? ' border:0;' : '' ) .
"'></div></div>
</div>
";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
