diff --git a/README.md b/README.md index fe3d2f2..77e173b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ #JEO -v1.0.7 +v1.0.8 JEO WordPress Theme acts as a geojournalism platform which allows news organizations, bloggers and NGOs to publish news stories as layers of information on digital maps. With JEO, creating the interaction between data layers and contextual information is much more intuitive and interactive. The theme is ready for multilingual content and facilitates the publishing tasks. diff --git a/inc/core.php b/inc/core.php index cada0ed..9f27c88 100644 --- a/inc/core.php +++ b/inc/core.php @@ -119,7 +119,7 @@ function scripts() { /* * Local */ - wp_enqueue_script('jeo', get_template_directory_uri() . '/inc/js/jeo.js', array('mapbox-js', 'underscore', 'jquery'), '0.4.3'); + wp_enqueue_script('jeo', get_template_directory_uri() . '/inc/js/jeo.js', array('mapbox-js', 'underscore', 'jquery'), '0.4.5'); wp_enqueue_script('jeo.groups', get_template_directory_uri() . '/inc/js/groups.js', array('jeo'), '0.2.7'); diff --git a/inc/js/jeo.js b/inc/js/jeo.js index b909f6f..9c3d8d5 100644 --- a/inc/js/jeo.js +++ b/inc/js/jeo.js @@ -121,11 +121,8 @@ var jeo = {}; /* * Legends */ - if(conf.legend) { - map.legendControl.addLegend(conf.legend); - } if(conf.legend_full) - jeo.enableDetails(map, conf.legend, conf.legend_full); + jeo.enableDetails(map, conf.legend_full); /* * Fullscreen @@ -236,7 +233,6 @@ var jeo = {}; jeo.loadLayers = function(map, parsedLayers) { for(var key in map.legendControl._legends) { - console.log(key); if(key.indexOf('map-details-link') == -1) map.legendControl.removeLegend(key); } @@ -331,12 +327,9 @@ var jeo = {}; /* * Legend page (map details) */ - jeo.enableDetails = function(map, legend, full) { - if(typeof legend === 'undefined') - legend = ''; + jeo.enableDetails = function(map, full) { - map.legendControl.removeLegend(legend); - map.conf.legend_full_content = legend + '' + jeo_localization.more_label + ''; + map.conf.legend_full_content = '' + jeo_localization.more_label + ''; map.legendControl.addLegend(map.conf.legend_full_content); var isContentMap = map.$.parents('.content-map').length; diff --git a/style.css b/style.css index e159ab3..a44cc74 100644 --- a/style.css +++ b/style.css @@ -4,7 +4,7 @@ Theme URI: https://github.com/cardume/jeo Author: Cardume Author URI: http://www.cardume.art.br/ Description: Interactive maps and journalism -Version: 1.0.7 +Version: 1.0.8 License: GNU General Public License v3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html Tags: black, white, green, light, four-columns, two-columns, responsive-layout, translation-ready, theme-options