Browse Source

make arguments and this more consistent in event dnd/resize handlers

Adam Shaw 11 years ago
parent
commit
6369e2bd90
2 changed files with 17 additions and 16 deletions
  1. 9 9
      src/agenda/AgendaEventRenderer.js
  2. 8 7
      src/common/DayEventRenderer.js

+ 9 - 9
src/agenda/AgendaEventRenderer.js

@@ -415,7 +415,7 @@ function AgendaEventRenderer() {
 			revertDuration: opt('dragRevertDuration'),
 			start: function(ev, ui) {
 
-				trigger('eventDragStart', eventElement, event, ev, ui);
+				trigger('eventDragStart', eventElement[0], event, ev, ui);
 				hideEvents(event, eventElement);
 				origWidth = eventElement.width();
 
@@ -467,7 +467,7 @@ function AgendaEventRenderer() {
 			stop: function(ev, ui) {
 				hoverListener.stop();
 				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
+				trigger('eventDragStop', eventElement[0], event, ev, ui);
 
 				if (revert) { // hasn't moved or is out of bounds (draggable has already reverted)
 					
@@ -487,7 +487,7 @@ function AgendaEventRenderer() {
 					}
 
 					eventDrop(
-						this, // el
+						eventElement[0],
 						event,
 						eventStart,
 						ev,
@@ -537,7 +537,7 @@ function AgendaEventRenderer() {
 			revertDuration: opt('dragRevertDuration'),
 			start: function(ev, ui) {
 
-				trigger('eventDragStart', eventElement, event, ev, ui);
+				trigger('eventDragStart', eventElement[0], event, ev, ui);
 				hideEvents(event, eventElement);
 
 				coordinateGrid.build();
@@ -621,11 +621,11 @@ function AgendaEventRenderer() {
 			stop: function(ev, ui) {
 
 				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
+				trigger('eventDragStop', eventElement[0], event, ev, ui);
 
 				if (isInBounds && (isAllDay || dayDelta || snapDelta)) { // changed!
 					eventDrop(
-						this, // el
+						eventElement[0],
 						event,
 						eventStart,
 						ev,
@@ -705,7 +705,7 @@ function AgendaEventRenderer() {
 			start: function(ev, ui) {
 				snapDelta = prevSnapDelta = 0;
 				hideEvents(event, eventElement);
-				trigger('eventResizeStart', this, event, ev, ui);
+				trigger('eventResizeStart', eventElement[0], event, ev, ui);
 			},
 			resize: function(ev, ui) {
 				// don't rely on ui.size.height, doesn't take grid into account
@@ -728,10 +728,10 @@ function AgendaEventRenderer() {
 				}
 			},
 			stop: function(ev, ui) {
-				trigger('eventResizeStop', this, event, ev, ui);
+				trigger('eventResizeStop', eventElement[0], event, ev, ui);
 				if (snapDelta) {
 					eventResize(
-						this,
+						eventElement[0],
 						event,
 						eventEnd,
 						ev,

+ 8 - 7
src/common/DayEventRenderer.js

@@ -575,7 +575,7 @@ function DayEventRenderer() {
 			opacity: opt('dragOpacity'),
 			revertDuration: opt('dragRevertDuration'),
 			start: function(ev, ui) {
-				trigger('eventDragStart', eventElement, event, ev, ui);
+				trigger('eventDragStart', eventElement[0], event, ev, ui);
 				hideEvents(event, eventElement);
 				hoverListener.start(function(cell, origCell, rowDelta, colDelta) {
 					eventElement.draggable('option', 'revert', !cell || !rowDelta && !colDelta);
@@ -598,10 +598,10 @@ function DayEventRenderer() {
 			stop: function(ev, ui) {
 				hoverListener.stop();
 				clearOverlays();
-				trigger('eventDragStop', eventElement, event, ev, ui);
+				trigger('eventDragStop', eventElement[0], event, ev, ui);
 				if (dayDelta) {
 					eventDrop(
-						this, // el
+						eventElement[0],
 						event,
 						eventStart,
 						ev,
@@ -653,7 +653,7 @@ function DayEventRenderer() {
 			$('body')
 				.css('cursor', direction + '-resize')
 				.one('mouseup', mouseup);
-			trigger('eventResizeStart', this, event, ev);
+			trigger('eventResizeStart', element[0], event, ev, {}); // {} is dummy jqui event
 			hoverListener.start(function(cell, origCell) {
 				if (cell) {
 
@@ -699,17 +699,18 @@ function DayEventRenderer() {
 			}, ev);
 			
 			function mouseup(ev) {
-				trigger('eventResizeStop', this, event, ev);
+				trigger('eventResizeStop', element[0], event, ev, {}); // {} is dummy jqui event
 				$('body').css('cursor', '');
 				hoverListener.stop();
 				clearOverlays();
 
 				if (dayDelta) {
 					eventResize(
-						this, // el
+						element[0],
 						event,
 						eventEnd,
-						ev
+						ev,
+						{} // dummy jqui event
 					);
 					// event redraw will clear helpers
 				}