mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00
Code Issues Releases Wiki Activity

[ticket/12327] Ajax fix

Browse Source 
PHPBB3-12327
This commit is contained in:
PayBas 2014-04-03 16:03:06 +02:00
parent e850e49a1b
commit 20c18d08e9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/styles/prosilver/template/ajax.js
View File

@ -206,6 +206,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
var poll = $('.topic_poll'); var poll = $('.topic_poll');
var panel = poll.find('.panel'); var panel = poll.find('.panel');
var results_visible = poll.find('dl:first-child .resultbar').is(':visible'); var results_visible = poll.find('dl:first-child .resultbar').is(':visible');
var most_votes = 0;
// Set min-height to prevent the page from jumping when the content changes // Set min-height to prevent the page from jumping when the content changes
var update_panel_height = function (height) { var update_panel_height = function (height) {
@ -228,6 +229,13 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500); poll.find('.resultbar, .poll_option_percent, .poll_total_votes').show(500);
} }
// Get the votes count of the highest poll option
poll.find('[data-poll-option-id]').each(function() {
var option = $(this);
var option_id = option.attr('data-poll-option-id');
most_votes = (res.vote_counts[option_id] >= most_votes) ? res.vote_counts[option_id] : most_votes;
});
// Update the total votes count // Update the total votes count
poll.find('.poll_total_vote_cnt').html(res.total_votes); poll.find('.poll_total_vote_cnt').html(res.total_votes);
@ -237,6 +245,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
var option_id = option.attr('data-poll-option-id'); var option_id = option.attr('data-poll-option-id');
var voted = (typeof res.user_votes[option_id] !== 'undefined') ? true : false; var voted = (typeof res.user_votes[option_id] !== 'undefined') ? true : false;
var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[option_id] / res.total_votes) * 100); var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[option_id] / res.total_votes) * 100);
var percent_rel = (most_votes == 0) ? 0 : Math.round((res.vote_counts[option_id] / most_votes) * 100);
option.toggleClass('voted', voted); option.toggleClass('voted', voted);
@ -246,7 +255,7 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
var new_bar_class = (percent == 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1); var new_bar_class = (percent == 100) ? 'pollbar5' : 'pollbar' + (Math.floor(percent / 20) + 1);
setTimeout(function () { setTimeout(function () {
bar.animate({width: percent + '%'}, 500).removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5').addClass(new_bar_class); bar.animate({width: percent_rel + '%'}, 500).removeClass('pollbar1 pollbar2 pollbar3 pollbar4 pollbar5').addClass(new_bar_class);
bar.html(res.vote_counts[option_id]); bar.html(res.vote_counts[option_id]);
var percent_txt = (!percent) ? res.NO_VOTES : percent + '%'; var percent_txt = (!percent) ? res.NO_VOTES : percent + '%';