Merge pull request #50 from simpixelated/timespanclick

starts #42; call timespan click from drillDown
mattlewis92 · Apr 9, 2015 · 564dd01 · 564dd01
2 parents 7dd703b + 8ba1e58
commit 564dd01
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/directives/mwlCalendarMonth.js b/src/directives/mwlCalendarMonth.js
@@ -62,7 +62,10 @@ angular
         };
 
         $scope.drillDown = function(day) {
-          $scope.calendarCtrl.changeView('day', moment($scope.currentDay).clone().date(day).toDate());
+          var date = moment($scope.currentDay).clone().date(day).toDate();
+          if ($scope.timespanClick({calendarDate: date}) !== false) {
+            $scope.calendarCtrl.changeView('day', date);
+          }
         };
 
         $scope.highlightEvent = function(event, shouldAddClass) {

diff --git a/src/directives/mwlCalendarWeek.js b/src/directives/mwlCalendarWeek.js
@@ -12,15 +12,19 @@ angular
         events: '=calendarEvents',
         currentDay: '=calendarCurrentDay',
         eventClick: '=calendarEventClick',
-        useIsoWeek: '=calendarUseIsoWeek'
+        useIsoWeek: '=calendarUseIsoWeek',
+        timespanClick: '=calendarTimespanClick'
       },
       controller: function($scope, moment, calendarHelper) {
         function updateView() {
           $scope.view = calendarHelper.getWeekView($scope.events, $scope.currentDay, $scope.useIsoWeek);
         }
 
         $scope.drillDown = function(day) {
-          $scope.calendarCtrl.changeView('day', moment($scope.currentDay).clone().date(day).toDate());
+          var date = moment($scope.currentDay).clone().date(day).toDate();
+          if ($scope.timespanClick({calendarDate: date}) !== false) {
+            $scope.calendarCtrl.changeView('day', date);
+          }
         };
 
         $scope.$watch('currentDay', updateView);

diff --git a/src/directives/mwlCalendarYear.js b/src/directives/mwlCalendarYear.js
@@ -58,7 +58,10 @@ angular
         };
 
         $scope.drillDown = function(month) {
-          $scope.calendarCtrl.changeView('month', moment($scope.currentDay).clone().month(month).toDate());
+          var date = moment($scope.currentDay).clone().month(month).toDate();
+          if ($scope.timespanClick({calendarDate: date}) !== false) {
+            $scope.calendarCtrl.changeView('month', date);
+          }
         };
       },
       link: function(scope, element, attrs, calendarCtrl) {

diff --git a/templates/main.html b/templates/main.html
@@ -34,6 +34,7 @@
     calendar-current-day="currentDay"
     calendar-event-click="eventClick"
     calendar-use-iso-week="useIsoWeek"
+    calendar-timespan-click="timespanClick"
     ng-switch-when="week"
     ></mwl-calendar-week>