WordPress.org
Get WordPress

Plugin Directory

Changeset 2380208


Ignore:
Timestamp:
09/13/2020 01:29:54 AM (5 years ago)
Author:
freeduke
Message:

1.3.6

  • Load scripts and styles only when shortcode presents, improve performance;
Location:
corona-virus-data/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • corona-virus-data/trunk/README.txt

    r2341405 r2380208  
    5959== Changelog ==
    6060
     61= 1.3.6 =
     62* Load scripts and styles only when shortcode presents, improve performance;
     63
    6164= 1.3.5 =
    6265* Upgrade the api from v2 to v3.

  • corona-virus-data/trunk/corona-virus-data.php

    r2341402 r2380208  
    1111 * Plugin URI:        https://www.dukeyin.com/corona-virus-data/
    1212 * Description:       This plugin use an api to display the "Corona virus" data in whole world and country you care through a shortcode [cov2019] or [cov2019all] in your WordPress post or page.
    13  * Version:           1.3.5
     13 * Version:           1.3.6
    1414 * Author:            Duke Yin
    1515 * Author URI:        https://www.dukeyin.com
    … …  
    2828 * Rename this for your plugin and update it as you release new versions.
    2929 */
    30 define('CORONA_VIRUS_DATA_VERSION', '1.3.5');
     30define('CORONA_VIRUS_DATA_VERSION', '1.3.6');
    3131define('CORONA_VIRUS_DATA_URL', plugin_dir_url(__FILE__));
    3232/**

  • corona-virus-data/trunk/includes/class-corona-virus-data.php

    r2341402 r2380208  
    222222function cov_func($atts, $content = null, $shortcodename = "")
    223223{
     224    wp_enqueue_style( 'corona-virus-data' );
    224225    $cov_country_n = __(get_option('cov__settings')['cov__select_field_0'],'corona-virus-data');
    225226    $return = '<div class="ncov2019">
    … …  
    247248    }
    248249    $return .= '</div>';
     250    wp_enqueue_script('corona-virus-data');
    249251    return $return;
    250252}
    … …  
    255257{
    256258    if (!is_admin()) {
    257         wp_enqueue_script('json2html', CORONA_VIRUS_DATA_URL . 'public/js/json2html.js', array(), CORONA_VIRUS_DATA_VERSION, true);
     259        wp_enqueue_script('json2html');
     260        wp_enqueue_style( 'corona-virus-data' );
     261        wp_enqueue_script('corona-virus-data');
    258262    }
    259263    $return = '<div class="ncov2019"><p>' . __('Sort by confirmed numbers.', 'corona-virus-data') . '</p><div id="cov_table_container"><table id="cov_all_table"><tbody><tr><th>' . __('Country or Region', 'corona-virus-data') . '</th><th>' . __('Cases', 'corona-virus-data') . '</th><th>' . __('Deaths', 'corona-virus-data') . '</b></th><th>' . __('Recovered', 'corona-virus-data') . '</th></tr></tbody></table><i class="cov-loading3"></i></div></div>';
    … …  
    265269function cov_map_func($atts, $content = null, $shortcodename = "")
    266270{
    267     if (!is_admin()) {
    268         wp_enqueue_style('leaflet', CORONA_VIRUS_DATA_URL . 'public/css/leaflet.css');
    269         wp_enqueue_script('leaflet', CORONA_VIRUS_DATA_URL . 'public/js/leaflet.js', array(), '1.6.0', true);
    270         wp_enqueue_script('cov_load_map', CORONA_VIRUS_DATA_URL . 'public/js/cov-load-map.js', array(), CORONA_VIRUS_DATA_VERSION, true);
    271     }
     271        wp_enqueue_style( 'corona-virus-data' );
     272        wp_enqueue_script('corona-virus-data');
     273       
     274        wp_enqueue_style('leaflet');
     275        wp_enqueue_script('leaflet');
     276        wp_enqueue_script('cov_load_map');
     277
    272278    $return = '<div class="ncov2019"><i class="cov-loading4"></i><div id="cov__map" class="cov_map"></div></div>';
    273279    return $return;
    … …  
    278284function cov_hist_all_func($atts, $content = null, $shortcodename = "")
    279285{
     286        wp_enqueue_style( 'corona-virus-data' );
     287        wp_enqueue_script('corona-virus-data');
     288        wp_enqueue_script('chart.js');
     289        wp_enqueue_script('chartjs-utils');
    280290    $return = '<div class="ncov2019"><div class="cov_chart_wrapper"><i class="cov-loading2"></i><canvas id="cov_hs_all" class="cov"></canvas></div>' ;
    281291    $return .= "<script>var getJSON=function(url,type){type=type||'get';return new Promise(function(resolve,reject){var xhr=new XMLHttpRequest();xhr.open(type,url,true);xhr.responseType='json';xhr.onload=function(){var status=xhr.status;if(status==200){resolve(xhr.response)}else{reject(status)}};xhr.send()})};getJSON('https://corona.lmao.ninja/v3/covid-19/historical/all').then(function(data){var config={type:'line',data:{labels:Object.keys(data.cases),datasets:[{label:cov__cases,backgroundColor:window.chartColors.red,borderColor:window.chartColors.red,data:Object.values(data.cases),fill:false,},{label:cov__deaths,fill:false,backgroundColor:window.chartColors.gray,borderColor:window.chartColors.gray,data:Object.values(data.deaths),},{label:cov__recoverd,fill:false,backgroundColor:window.chartColors.blue,borderColor:window.chartColors.blue,data:Object.values(data.recovered),}]},options:{responsive:true,devicePixelRatio:4,elements:{line:{borderWidth:4},point:{radius:4,hoverRadius:8}},title:{display:true,text:cov__history_global,fontSize:30,},legend:{display:true,labels:{fontSize:12,padding:20,}},tooltips:{mode:'index',intersect:false,titleFontSize:20,},tooltipFontSize:20,hover:{mode:'nearest',intersect:true},scales:{x:{display:true,ticks:{fontSize:14}},y:{display:true,ticks:{fontSize:14}}},maintainAspectRatio:false}};var ctx=document.getElementById('cov_hs_all').getContext('2d');window.myLine=new Chart(ctx,config)},function(status){console.log(status)});</script></div>";
    … …  
    287297function cov_hist_c_func($atts, $content = null, $shortcodename = "")
    288298{
     299        wp_enqueue_style( 'corona-virus-data' );
     300        wp_enqueue_script('corona-virus-data');
     301        wp_enqueue_script('chart.js');
     302        wp_enqueue_script('chartjs-utils');
    289303    $return = '<div class="ncov2019"><div class="cov_chart_wrapper"><i class="cov-loading2"></i><canvas id="cov_hs_c" class="cov"></canvas></div>' ;
    290304    $return .= "<script>var getJSON=function(url,type){type=type||'get';return new Promise(function(resolve,reject){var xhr=new XMLHttpRequest();xhr.open(type,url,true);xhr.responseType='json';xhr.onload=function(){var status=xhr.status;if(status==200){resolve(xhr.response)}else{reject(status)}};xhr.send()})};getJSON('https://corona.lmao.ninja/v3/covid-19/historical/'+cov__contry).then(function(data){var config={type:'line',data:{labels:Object.keys(data.timeline.cases),datasets:[{label:cov__cases,backgroundColor:window.chartColors.red,borderColor:window.chartColors.red,data:Object.values(data.timeline.cases),fill:false,},{label:cov__deaths,fill:false,backgroundColor:window.chartColors.gray,borderColor:window.chartColors.gray,data:Object.values(data.timeline.deaths),},{label:cov__recoverd,fill:false,backgroundColor:window.chartColors.blue,borderColor:window.chartColors.blue,data:Object.values(data.timeline.recovered),}]},options:{responsive:true,devicePixelRatio:4,elements:{line:{borderWidth:4},point:{radius:4,hoverRadius:8}},title:{display:true,text:cov__contry_text+' '+cov__history_c,fontSize:30,},legend:{display:true,labels:{fontSize:12,padding:20,}},tooltips:{mode:'index',intersect:false,titleFontSize:20,},tooltipFontSize:20,hover:{mode:'nearest',intersect:true},scales:{x:{display:true,ticks:{fontSize:14}},y:{display:true,ticks:{fontSize:14}}},maintainAspectRatio:false}};var ctx=document.getElementById('cov_hs_c').getContext('2d');window.myLine=new Chart(ctx,config)},function(status){console.log(status)});</script></div>";
    … …  
    295309//[cov2019namerica] North America na
    296310function cov_n_america($atts, $content = null, $shortcodename = ""){
     311    wp_enqueue_style( 'corona-virus-data' );
     312    wp_enqueue_script('corona-virus-data');
    297313    $return = '<div class="ncov2019">
    298314    <div class="title text-center">' . __('North America', 'corona-virus-data') . '</div>
    … …  
    313329//[cov2019samerica]South America sa
    314330function cov_s_america($atts, $content = null, $shortcodename = ""){
     331    wp_enqueue_style( 'corona-virus-data' );
     332    wp_enqueue_script('corona-virus-data');
    315333    $return = '<div class="ncov2019">
    316334    <div class="title text-center">' . __('South America', 'corona-virus-data') . '</div>
    … …  
    331349//[cov2019europe]Europe eu
    332350function cov_europe($atts, $content = null, $shortcodename = ""){
     351    wp_enqueue_style( 'corona-virus-data' );
     352    wp_enqueue_script('corona-virus-data');
    333353    $return = '<div class="ncov2019">
    334354    <div class="title text-center">' . __('Europe', 'corona-virus-data') . '</div>
    … …  
    349369//[cov2019asia]Asia as
    350370function cov_asia($atts, $content = null, $shortcodename = ""){
     371    wp_enqueue_style( 'corona-virus-data' );
     372    wp_enqueue_script('corona-virus-data');
    351373    $return = '<div class="ncov2019">
    352374    <div class="title text-center">' . __('Asia', 'corona-virus-data') . '</div>
    … …  
    367389//[cov2019oceania]Oceania oa
    368390function cov_oceania($atts, $content = null, $shortcodename = ""){
     391    wp_enqueue_style( 'corona-virus-data' );
     392    wp_enqueue_script('corona-virus-data');
    369393    $return = '<div class="ncov2019">
    370394    <div class="title text-center">' . __('Oceania', 'corona-virus-data') . '</div>
    … …  
    385409//[cov2019africa]Africa af
    386410function cov_africa($atts, $content = null, $shortcodename = ""){
     411    wp_enqueue_style( 'corona-virus-data' );
     412    wp_enqueue_script('corona-virus-data');
    387413    $return = '<div class="ncov2019">
    388414    <div class="title text-center">' . __('Africa', 'corona-virus-data') . '</div>

  • corona-virus-data/trunk/public/class-corona-virus-data-public.php

    r2284625 r2380208  
    6767         * class.
    6868         */
    69         wp_enqueue_style($this->plugin_name, plugin_dir_url(__FILE__) . 'css/corona-virus-data-public.css', array(), $this->version, 'all');
     69        wp_register_style($this->plugin_name, plugin_dir_url(__FILE__) . 'css/corona-virus-data-public.css', array(), $this->version, 'all' );
     70        wp_register_style('leaflet', plugin_dir_url(__FILE__) . 'css/leaflet.css');
    7071    }
    7172    /**
    … …  
    8788         * class.
    8889         */
    89         wp_enqueue_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/corona-virus-data-public.js', array('jquery'), $this->version, false);
    90         wp_enqueue_script('chart.js', plugin_dir_url(__FILE__) . 'js/Chart.min.js', array(), '3.0.0', false);
    91         wp_enqueue_script('chartjs-utils', plugin_dir_url(__FILE__) . 'js/utils.js', array(), $this->version, false);
     90        wp_register_script($this->plugin_name, plugin_dir_url(__FILE__) . 'js/corona-virus-data-public.js', array('jquery'), $this->version, false);
     91        wp_register_script('chart.js', plugin_dir_url(__FILE__) . 'js/Chart.min.js', array(), '3.0.0', false);
     92        wp_register_script('chartjs-utils', plugin_dir_url(__FILE__) . 'js/utils.js', array(), $this->version, false);
     93        wp_register_script('json2html', plugin_dir_url(__FILE__) . 'js/json2html.js', array(), $this->version, true);
     94        wp_register_script('leaflet', plugin_dir_url(__FILE__) . 'js/leaflet.js', array(), '1.6.0', true);
     95        wp_register_script('cov_load_map', plugin_dir_url(__FILE__) . 'js/cov-load-map.js', array(), $this->version, true);
    9296    }
    9397}
Note: See TracChangeset for help on using the changeset viewer.