Cleanup the javascript for the date selector

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index e531e375a9..16bd263225 100644
--- a/plugins/CoreHome/javascripts/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
@@ -442,14 +442,14 @@
         });
 
         // reset date/period when opening calendar
-        var firstClick = true;
         $('#periodString #date').click(function () {
-            if (!firstClick) {
-                datepickerElem.datepicker('setDate', currentDate);
-                $('#period_id_' + piwik.period).click();
-            }
+            $("#periodMore").toggle();
+        });
 
-            firstClick = false;
+        $('body').on('click', function(e) {
+            if (!$(e.target).parents('#periodString').length && !$(e.target).is('#periodString') && !$(e.target).is('option') && $("#periodMore").is(":visible")) {
+                $("#periodMore").hide();
+            }
         });
 
         function onDateRangeSelect(dateText, inst) {