WordPress.org
Get WordPress

Plugin Directory

Changeset 352791


Ignore:
Timestamp:
02/28/2011 12:45:29 AM (15 years ago)
Author:
dugbug
Message:

0.9.7 for real

Location:
easy-chart-builder/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • easy-chart-builder/trunk/easy-chart-builder.php

    r352484 r352791  
    22/*
    33Plugin Name: Easy Chart Builder
    4 Version: 0.9.6
     4Version: 0.9.7
    55Plugin URI: http://www.dyerware.com/main/easy-chart-builder
    66Description: Creates a chart directly in your post or page via shortcut.  Manages sizing of chart to support wptouch and other mobile themes.

  • easy-chart-builder/trunk/js/easy-chart-builder.js

    r210780 r352791  
    11/**
    22 * Handle: easyChartBuilder
    3  * Version: 0.10.2
     3 * Version: 0.11.0
    44 * Enqueue: true
    55 *
    … …  
    1111 
    1212
     13
    1314String.prototype.trim = function ()
    1415{
    … …  
    2829        e.style.display = 'block';
    2930}
    30    
     31   
     32 
    3133easyChartBuilder.prototype.pieChart = function(chartId, chartImg, chartWidth, chartHeight, chartHandle)
    3234{
    … …  
    141143        else {minAxis = "0";}
    142144    }
     145 
    143146       
    144147    tempString = chartHandle["watermark"];
    … …  
    152155    var chartMarkers = this.buildMarkers(chartHandle, tempGroupNames.length);
    153156   
    154     var url_src = null;   
     157    var url_src = null; 
    155158    var common_parts = "chs=" + chartWidth + "x" + chartHeight +
    156159        "&chma=10,10,10,40" +
    … …  
    161164        chartMarkers;
    162165   
     166    var gridOut = chartHandle["grid"]; 
     167    var gridGroups = 100.0 / chartGroups;
     168    var gridValues = 100.0 / 10.0;
     169   
    163170    if (chartType == "vertbar")
    164171    {
    165172        url_src ="http://chart.apis.google.com/chart?cht=bvg&chbh=r,0.2,1.0&" + common_parts +
    166173        "&chxt=y,x&chxr=0," + minAxis + "," + maxMin[0];
     174       
     175        if (gridOut == true)
     176            {url_src += "&chg=" + 0 + "," + gridValues + ",1,5";}
    167177    }
    168178    else if (chartType == "horizbar")
    … …  
    170180        url_src ="http://chart.apis.google.com/chart?cht=bhg&chbh=r,0.2,1.0&" + common_parts +
    171181        "&chxt=x,y&chxr=0," + minAxis + "," + maxMin[0];
     182        if (gridOut == true)
     183            {url_src += "&chg=" + gridValues + "," + 0 + ",1,5";}
    172184    }
    173185    else if (chartType == "vertbarstack")
    … …  
    175187        url_src ="http://chart.apis.google.com/chart?cht=bvs&chbh=r,0.2,1.0&" + common_parts +
    176188        "&chxt=y,x&chxr=0," + minAxis + "," + maxMin[0];
     189        if (gridOut == true)
     190            {url_src += "&chg=" + 0 + "," + gridValues + ",1,5";}
    177191    }
    178192    else if (chartType == "horizbarstack")
    … …  
    180194        url_src ="http://chart.apis.google.com/chart?cht=bhs&chbh=r,0.2,1.0&" + common_parts +
    181195        "&chxt=x,y&chxr=0," + minAxis + "," + maxMin[0];
     196        if (gridOut == true)
     197            {url_src += "&chg=" + gridValues + "," + 0 + ",1,5";}
    182198    }   
    183199    else if (chartType == "line")
    … …  
    185201        url_src ="http://chart.apis.google.com/chart?cht=lc&" + common_parts +
    186202        "&chxt=y,x&chxr=0," + minAxis + "," + maxMin[0];
     203        if (gridOut == true)
     204            {url_src += "&chg=" + gridGroups + "," + gridValues + ",1,5";}
    187205    }   
    188206    else
    … …  
    285303}
    286304
     305easyChartBuilder.prototype.commaFormat = function(inNum)
     306{
     307    var num = Math.floor(inNum);
     308    num = num.toString();
     309    for (var i = 0; i < Math.floor((num.length-(1+i))/3); i++)
     310    num = num.substring(0,num.length-(4*i+3))+','+
     311    num.substring(num.length-(4*i+3));
     312   
     313    return num;
     314}
    287315
    288316easyChartBuilder.prototype.buildChartData = function(handle, headers, valueGrid)
    … …  
    301329    {
    302330        precisionVal = parseInt(precision);
     331    }
     332   
     333    var commatize = false;
     334    if (currency != "")
     335    {
     336        commatize = true;
    303337    }
    304338                 
    … …  
    316350    {       
    317351        var tval = 0.0;
     352        var tString;
    318353       
    319354        output = output + "<tr><th align='right'>" + valueTitles[t].trim() + "</th>";
    … …  
    324359                else
    325360                {tval = valueGrid[v][t].toFixed(precisionVal);}
    326                 output = output + "<td>" + currency + tval + "</td>";
     361               
     362             
     363                if (commatize)
     364                    {tString = this.commaFormat(tval);}
     365                else
     366                    {tString = tval;}
     367               
     368                output = output + "<td>" + currency + tString + "</td>";
    327369             }
    328370        output = output + "</tr>";
    … …  
    567609        this.groupChart(chartType, chartId, imgId, new_width, new_height, chartHandle);
    568610    }
    569    
    570     /*
    571     else if (chartType == "vertbar")
    572     {
    573         this.vertBarChart(chartId, imgId, new_width, new_height, chartHandle);
    574     }
    575     else if (chartType == "horizbar")
    576     {
    577         this.horizBarChart(chartId, imgId, new_width, new_height, chartHandle);
    578     }
    579     else if (chartType == "line")
    580     {
    581         this.lineChart(chartId, imgId, new_width, new_height, chartHandle);
    582     }   
    583     else
    584     {
    585         alert("Unknown chart type: " + chartType);
    586         imgId.src = "NO_VALID_CHART_TYPE";
    587     }   
    588     */
     611
    589612};
    590613

  • easy-chart-builder/trunk/readme.txt

    r352484 r352791  
    66Requires at least: 2.8
    77Tested up to: 3.1
    8 Stable tag: 0.9.6
     8Stable tag: 0.9.7
    99
    1010This plugin allows you to easily create charts within your blog by use of shortcodes.
    … …  
    7171== Upgrade Notice ==
    7272
    73 = 0.9.6 =
     73= 0.9.7 =
    7474Added grid background option (use argument 'grid' with true or false).
    7575Currency now results in comma separated values in table data.
    … …  
    113113
    114114== Changelog ==
     115
     116= 0.9.7 =
     117 * Fixed commas.
    115118
    116119= 0.9.6 =
Note: See TracChangeset for help on using the changeset viewer.