@@ -83,6 +83,9 @@ module.exports = define = ns.define = function(objPrototype, defines, baseDefine
8383		return  data ; 
8484	} ) ; 
8585
86+ 	// Add in the base event methods 
87+ 	define . addBaseEvents ( objPrototype ) ; 
88+ 
8689	// Add necessary event methods to this object. 
8790	for  ( var  prop  in  eventsProto )  { 
8891		Object . defineProperty ( objPrototype ,  prop ,  { 
@@ -280,7 +283,7 @@ make = {
280283				if  ( newVal  !==  current )  { 
281284					setData . call ( this ,  newVal ) ; 
282285
283- 					canEvent . dispatch . call ( this ,  { 
286+ 					canEvent . trigger . call ( this ,  { 
284287						type : prop , 
285288						target : this 
286289					} ,  [ newVal ,  current ] ) ; 
@@ -644,7 +647,6 @@ assign(eventsProto, {
644647	_eventSetup : function ( )  { } , 
645648	_eventTeardown : function ( )  { } , 
646649	addEventListener : function ( eventName ,  handler )  { 
647- 
648650		var  computedBinding  =  this . _computed  &&  this . _computed [ eventName ] ; 
649651		if  ( computedBinding  &&  computedBinding . compute )  { 
650652			if  ( ! computedBinding . count )  { 
@@ -656,10 +658,7 @@ assign(eventsProto, {
656658
657659		} 
658660
659- 		var  baseAddEventListener  =  this . __proto__ . addEventListener  || 
660- 			eventLifecycle . addAndSetup ; 
661- 
662- 		return  baseAddEventListener . apply ( this ,  arguments ) ; 
661+ 		return  this . _baseEvents . addEventListener . apply ( this ,  arguments ) ; 
663662	} , 
664663
665664	// ### unbind 
@@ -678,8 +677,7 @@ assign(eventsProto, {
678677
679678		} 
680679
681- 		return  eventLifecycle . removeAndTeardown . apply ( this ,  arguments ) ; 
682- 
680+ 		return  this . _baseEvents . removeEventListener . apply ( this ,  arguments ) ; 
683681	} 
684682} ) ; 
685683eventsProto . on  =  eventsProto . bind  =  eventsProto . addEventListener ; 
@@ -721,6 +719,14 @@ define.setup = function(props, sealed) {
721719} ; 
722720define . replaceWith  =  replaceWith ; 
723721define . eventsProto  =  eventsProto ; 
722+ define . addBaseEvents  =  function ( objPrototype ) { 
723+ 	objPrototype . _baseEvents  =  objPrototype . addEventListener  && 
724+ 	 	objPrototype . addEventListener  !==  eventsProto . addEventListener  ?
725+ 		{  addEventListener : objPrototype . addEventListener , 
726+ 			removeEventListener : objPrototype . removeEventListener  }  :
727+ 		{  addEventListener : eventLifecycle . addAndSetup , 
728+ 			removeEventListener : eventLifecycle . removeAndTeardown  } ; 
729+ } ; 
724730define . defineConfigurableAndNotEnumerable  =  defineConfigurableAndNotEnumerable ; 
725731define . make  =  make ; 
726732define . getDefinitionOrMethod  =  getDefinitionOrMethod ; 
0 commit comments