瀏覽代碼

stop using legacy event internally in many places

Adam Shaw 8 年之前
父節點
當前提交
02edad0ee8
共有 6 個文件被更改,包括 22 次插入10 次删除
  1. 4 3
      src/common/ChronoComponent.js
  2. 1 1
      src/common/DayGrid.events.js
  3. 7 2
      src/common/DayGrid.limit.js
  4. 1 1
      src/common/Grid.events.js
  5. 7 2
      src/common/View.js
  6. 2 1
      src/list/ListView.js

+ 4 - 3
src/common/ChronoComponent.js

@@ -401,7 +401,7 @@ var ChronoComponent = Model.extend({
 			// Then, compute the 'el' for each segment. An el might be null if the eventRender callback returned false.
 			// Then, compute the 'el' for each segment. An el might be null if the eventRender callback returned false.
 			$(html).each(function(i, node) {
 			$(html).each(function(i, node) {
 				var seg = segs[i];
 				var seg = segs[i];
-				var el = _this.resolveEventEl(seg.event, $(node));
+				var el = _this.resolveEventEl(seg.footprint, $(node));
 
 
 				if (el) {
 				if (el) {
 					el.data('fc-seg', seg); // used by handlers
 					el.data('fc-seg', seg); // used by handlers
@@ -423,8 +423,9 @@ var ChronoComponent = Model.extend({
 
 
 	// Given an event and the default element used for rendering, returns the element that should actually be used.
 	// Given an event and the default element used for rendering, returns the element that should actually be used.
 	// Basically runs events and elements through the eventRender hook.
 	// Basically runs events and elements through the eventRender hook.
-	resolveEventEl: function(event, el) {
-		var custom = this.publiclyTrigger('eventRender', event, event, el);
+	resolveEventEl: function(eventFootprint, el) {
+		var legacy = eventFootprint.getEventLegacy();
+		var custom = this.publiclyTrigger('eventRender', legacy, legacy, el);
 
 
 		if (custom === false) { // means don't render at all
 		if (custom === false) { // means don't render at all
 			el = null;
 			el = null;

+ 1 - 1
src/common/DayGrid.events.js

@@ -26,7 +26,7 @@ DayGrid.mixin({
 
 
 		// don't render timed background events
 		// don't render timed background events
 		var allDaySegs = $.grep(segs, function(seg) {
 		var allDaySegs = $.grep(segs, function(seg) {
-			return seg.event.allDay;
+			return seg.footprint.componentFootprint.isAllDay;
 		});
 		});
 
 
 		return Grid.prototype.renderBgSegs.call(this, allDaySegs); // call the super-method
 		return Grid.prototype.renderBgSegs.call(this, allDaySegs); // call the super-method

+ 7 - 2
src/common/DayGrid.limit.js

@@ -250,9 +250,14 @@ DayGrid.mixin({
 				// notify events to be removed
 				// notify events to be removed
 				if (_this.popoverSegs) {
 				if (_this.popoverSegs) {
 					var seg;
 					var seg;
-					for (var i = 0; i < _this.popoverSegs.length; ++i) {
+					var legacy;
+					var i;
+
+					for (i = 0; i < _this.popoverSegs.length; ++i) {
 						seg = _this.popoverSegs[i];
 						seg = _this.popoverSegs[i];
-						view.publiclyTrigger('eventDestroy', seg.event, seg.event, seg.el);
+						legacy = seg.footprint.getEventLegacy();
+
+						view.publiclyTrigger('eventDestroy', legacy, legacy, seg.el);
 					}
 					}
 				}
 				}
 				_this.segPopover.removeElement();
 				_this.segPopover.removeElement();

+ 1 - 1
src/common/Grid.events.js

@@ -87,7 +87,7 @@ Grid.mixin({
 
 
 	// Renders a background event element, given the default rendering. Called by the fill system.
 	// Renders a background event element, given the default rendering. Called by the fill system.
 	bgEventSegEl: function(seg, el) {
 	bgEventSegEl: function(seg, el) {
-		return this.resolveEventEl(seg.event, el); // will filter through eventRender
+		return this.resolveEventEl(seg.footprint, el); // will filter through eventRender
 	},
 	},
 
 
 
 

+ 7 - 2
src/common/View.js

@@ -653,8 +653,11 @@ var View = FC.View = ChronoComponent.extend({
 		this.applyScreenState();
 		this.applyScreenState();
 
 
 		this.renderedEventSegEach(function(seg) {
 		this.renderedEventSegEach(function(seg) {
-			this.publiclyTrigger('eventAfterRender', seg.event, seg.event, seg.el);
+			var legacy = seg.footprint.getEventLegacy();
+
+			this.publiclyTrigger('eventAfterRender', legacy, legacy, seg.el);
 		});
 		});
+
 		this.publiclyTrigger('eventAfterAllRender');
 		this.publiclyTrigger('eventAfterAllRender');
 	},
 	},
 
 
@@ -664,7 +667,9 @@ var View = FC.View = ChronoComponent.extend({
 		this.applyScreenState();
 		this.applyScreenState();
 
 
 		this.renderedEventSegEach(function(seg) {
 		this.renderedEventSegEach(function(seg) {
-			this.publiclyTrigger('eventDestroy', seg.event, seg.event, seg.el);
+			var legacy = seg.footprint.getEventLegacy();
+
+			this.publiclyTrigger('eventDestroy', legacy, legacy, seg.el);
 		});
 		});
 	},
 	},
 
 

+ 2 - 1
src/list/ListView.js

@@ -129,7 +129,8 @@ var ListViewGrid = Grid.extend({
 
 
 		// not clicking on or within an <a> with an href
 		// not clicking on or within an <a> with an href
 		if (!$(ev.target).closest('a[href]').length) {
 		if (!$(ev.target).closest('a[href]').length) {
-			url = seg.event.url;
+			url = seg.footprint.eventDef.url;
+
 			if (url && !ev.isDefaultPrevented()) { // jsEvent not cancelled in handler
 			if (url && !ev.isDefaultPrevented()) { // jsEvent not cancelled in handler
 				window.location.href = url; // simulate link click
 				window.location.href = url; // simulate link click
 			}
 			}