Merge with master

1 files changed, 10 insertions, 7 deletions

diff --git a/plugins/CoreHome/javascripts/calendar.js b/plugins/CoreHome/javascripts/calendar.js
index 16bd263225..4eb1d9d610 100644
--- a/plugins/CoreHome/javascripts/calendar.js
+++ b/plugins/CoreHome/javascripts/calendar.js
@@ -289,8 +289,8 @@
         };
 
         var togglePeriodPickers = function (showSingle) {
-            $('#periodString .period-date').toggle(showSingle);
-            $('#periodString .period-range').toggle(!showSingle);
+            $('#periodString').find('.period-date').toggle(showSingle);
+            $('#periodString').find('.period-range').toggle(!showSingle);
             $('#calendarRangeApply').toggle(!showSingle);
         };
 
@@ -379,13 +379,13 @@
             return false;
         };
 
-        $("#otherPeriods label").on('click', function (e) {
+        $("#otherPeriods").find("label").on('click', function (e) {
             var id = $(e.target).attr('for');
             changePeriodOnClick($('#' + id));
         });
 
         // when non-range period is clicked, change the period & refresh the date picker
-        $("#otherPeriods input").on('click', function (e) {
+        $("#otherPeriods").find("input").on('click', function (e) {
             var request_URL = $(e.target).val(),
                 period = broadcast.getValueFromUrl('period', request_URL),
                 lastPeriod = selectedPeriod;
@@ -442,8 +442,11 @@
         });
 
         // reset date/period when opening calendar
-        $('#periodString #date').click(function () {
-            $("#periodMore").toggle();
+        $("#periodString").on('click', "#date,.calendar-icon", function () {
+            var periodMore = $("#periodMore").toggle();
+            if (periodMore.is(":visible")) {
+                periodMore.find(".ui-state-highlight").removeClass('ui-state-highlight');
+            }
         });
 
         $('body').on('click', function(e) {
@@ -497,7 +500,7 @@
                     if (!isValidDate(oDateFrom)
                         || !isValidDate(oDateTo)
                         || oDateFrom > oDateTo) {
-                        $('#alert h2').text(_pk_translate('General_InvalidDateRange_js'));
+                        $('#alert').find('h2').text(_pk_translate('General_InvalidDateRange_js'));
                         piwikHelper.modalConfirm('#alert', {});
                         return false;
                     }