From 830bf784765950701d76626ba1b9fd4db50be6eb Mon Sep 17 00:00:00 2001 From: SJohnson Date: Thu, 31 Mar 2016 11:21:35 +0100 Subject: [PATCH] Fixed back button loading --- css/site.css | 4 ---- index.html | 7 ------- js/indicators.js | 6 ++++-- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/css/site.css b/css/site.css index 81714c1..add1398 100644 --- a/css/site.css +++ b/css/site.css @@ -10,10 +10,6 @@ height:775px; } -#wfp-viz-ind #wfp-viz-gridlayer { - display:none; -} - #wfp-viz-ind #wfp-viz-returnmap { background-color: #2A93FC; border-radius: 6px; diff --git a/index.html b/index.html index 40e98a2..1a8e279 100644 --- a/index.html +++ b/index.html @@ -19,14 +19,7 @@
-
- -
-
-

Yemen - mVAM Food Security Monitoring

diff --git a/js/indicators.js b/js/indicators.js index 233116f..33967dd 100644 --- a/js/indicators.js +++ b/js/indicators.js @@ -260,7 +260,6 @@ config.columns = [ function initCountry(ADM0_CODE){ $('#wfp-viz-maplayer').slideUp(function(){ $('#wfp-viz-gridmap').html('

Loading...') - $('#wfp-viz-gridlayer').show(); }); //if(Number(feature.properties.ADM0_CODE)*1==Number(c.code)*1){ //https://ds-ec2.scraperwiki.com/gfudhzb/r8kisejjlofexpc/sql?q=SELECT CASE WHEN StDev IS NULL OR (StDev IS NOT NULL AND Variable LIKE '%=%' AND (ifnull(CnfIntvHi,1)-ifnull(CnfIntvLo,0))/Mean<=0.12) OR (StDev IS NOT NULL AND Variable NOT LIKE '%=%' AND (ifnull(CnfIntvHi,Pctl95)-ifnull(CnfIntvLo,0))/Mean<=0.12) THEN Mean ELSE NULL END as MEAN, * FROM pblStatsSum4Maps WHERE ADM0_CODE='269' AND ADM1_CODE IS NOT NULL AND ADM2_CODE IS NULL AND ADM3_CODE IS NULL ORDER BY LENGTH(SvyYear), SvyYear,LENGTH(SvyMonthNum),SvyMonthNum @@ -401,6 +400,7 @@ function initGrid(data,dates,geom,countryID){ var grid = {}; categories.forEach(function(cat){ + console.log($('#wfp-viz-grid-'+cat.toLowerCase()).width()); var columns = []; config.columns.forEach(function(c){ if(c['group']==cat){ @@ -531,4 +531,6 @@ updateData = function(data){ var bottommap; -initCountry(269); \ No newline at end of file +$(document).ready(function(){ + initCountry(269) +}); \ No newline at end of file