diff --git a/js/index.js b/js/index.js index e0f83d9..3904271 100644 --- a/js/index.js +++ b/js/index.js @@ -82,13 +82,30 @@ var geoJsonOptions = { clearInterval(disappearanceTimer); if(willDisappearTs) { - var popup = this._popup; + var marker = this, + popup = marker._popup; var updateText = function() { var text = "", secondsLeft = (willDisappearTs - new Date().getTime()) / 1000; // How long until Pokemon disappears (in seconds) - if(secondsLeft > 60) { + if(secondsLeft <= 0) { + text = "(disappeared "; + var secondsAgo = Math.abs(secondsLeft); + + marker.setOpacity(0.33); + + if(secondsAgo > 60) { + var min = Math.round(secondsAgo / 60); + + text += min + " minute"+ (min !== 1 ? "s" : "") +" ago"; + } else { + var sec = Math.round(secondsAgo); + + text += sec + " second"+ (sec !== 1 ? "s" : "") +" ago"; + } + text +=")"; + } else if(secondsLeft > 60) { var min = Math.round(secondsLeft / 60); text = min + " minute"+ (min !== 1 ? "s" : "") +" remaining";