website Changeset - a7a15cec8b57 · Conservancy Kallithea

Changeset - a7a15cec8b57

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Bradley Kuhn (bkuhn) - 9 years ago 2015-03-12 01:36:01
bkuhn@ebb.org

Better handle no value situations.

The issue where these values were empty was not properly handled.

1 file changed with 7 insertions and 6 deletions:

www/conservancy/static/supporter-page.js

0 comments (0 inline, 0 general)

www/conservancy/static/supporter-page.js

➞

Show inline comments

 /* Copyright (C) 2012-2013 Denver Gingerich,
 ** Copyright (C) 2013-2014 Bradley M. Kuhn.
 ** License: GPLv3-or-later
 **  Find a copy of GPL at https://sfconservancy.org/GPLv3
 */
 $(document).ready(function() {
     var goal  = $('span#fundraiser-goal').text();
     var soFar = $('span#fundraiser-so-far').text();
     var donationCount = $('span#fundraiser-donation-count').text();
     var noCommaGoal = goal.replace(/,/g, "");
     var noCommaSoFar = soFar.replace(/,/g, "");
     var noCommaGoal = parseFloat(goal.replace(/,/g, ""));
     var noCommaSoFar = parseFloat(soFar.replace(/,/g, ""));
     var noCommaDonationCount = parseInt(donationCount.replace(/,/g, ""));
     var percentage = (parseFloat(noCommaSoFar) / parseFloat(noCommaGoal)) * 100;
     var curValue = 0.00;
     var incrementSoFar = 0.00;
     var incrementDonationCount = 0;
     $('span#fundraiser-percentage').text("");
     $('span#fundraiser-percentage').css({ 'color'        : 'green',
                                           'font-weight'  : 'bold',
                                           'float'        : 'right',
                                           'margin-right' : '40%',
                                           'margin-top'   : '2.5%',
                                           'text-align'   : 'inherit'});
     $("#progressbar").progressbar({ value:  curValue });
     function riseDonationProgressBar() {
         if (curValue >= percentage) {
             $('span#fundraiser-so-far').text(soFar);
             $("#progressbar").progressbar({ value :  percentage });
             $('span#fundraiser-percentage').text(percentage.toFixed(1) + "%");
         } else {
             var newVal = (curValue / 100.00) * noCommaGoal;
             $("#progressbar").progressbar({ value:  curValue });
             $('span#fundraiser-so-far').text(newVal.toLocaleString());
             curValue += 0.5;
             setTimeout(riseDonationProgressBar, 50);
+        }
@@ ... / @@ -41,25 +38,29 @@ $(document).ready(function() { @@
     function riseDonationCount() {
         if (incrementDonationCount >= noCommaDonationCount) {
             $('span#fundraiser-donation-count').text(donationCount);
         } else {
             $('span#fundraiser-donation-count').text(incrementDonationCount.toLocaleString());
             incrementDonationCount++;
             setTimeout(riseDonationCount, 50);
+        }
+    }
     if (noCommaDonationCount > 0) {
         riseDonationCount();
+    }
     riseDonationProgressBar();
     if (noCommaSoFar > 0.00 and noCommaGoal > 0.00) {
         $('span#fundraiser-percentage').text("");
         $("#progressbar").progressbar({ value:  curValue });
         riseDonationProgressBar();
+    }
     $('.toggle-content').hide();
     $('.toggle-control')
      .addClass('clickable')
      .bind('click', function() {
         var $control = $(this);
         var $parent = $control.parents('.toggle-unit');
         $parent.toggleClass('expanded');
         $parent.find('.toggle-content').slideToggle();

0 comments (0 inline, 0 general)