Ver Fonte

dont fire dayClick when nav link click

Adam Shaw há 9 anos atrás
pai
commit
74ee10b8a6
2 ficheiros alterados com 15 adições e 1 exclusões
  1. 5 1
      src/common/Grid.js
  2. 10 0
      tests/manual/nav-links.html

+ 5 - 1
src/common/Grid.js

@@ -197,7 +197,11 @@ var Grid = FC.Grid = Class.extend(ListenerMixin, MouseIgnorerMixin, {
 		// jQuery will take care of unregistering them when removeElement gets called.
 		this.el.on(name, function(ev) {
 			if (
-				!$(ev.target).is('.fc-event-container *, .fc-more') // not an an event element, or "more.." link
+				!$(ev.target).is(
+					this.segSelector + ',' + // an event element
+					'.fc-more,' + // a "more.." link
+					'[data-fc-goto]' // a clickable nav link
+				)
 			) {
 				return handler.call(_this, ev);
 			}

+ 10 - 0
tests/manual/nav-links.html

@@ -18,9 +18,19 @@
 				right: 'month,agendaWeek,agendaDay,listWeek'
 			},
 			defaultDate: '2014-06-12',
+			weekNumberCalculation: 'ISO',
 			weekNumbersWithinDays: true,
 			weekNumbers: true,
+
 			navLinks: true,
+			//navLinks: {
+			//	day: 'agendaDay'
+			//},
+
+			dayClick: function() {
+				alert('dayClick!!!'); // should not fire
+			},
+
 			editable: true,
 			events: [
 				{