diff --git a/event/default/default.js b/event/default/default.js
index 4ac8100b..050512ff 100644
--- a/event/default/default.js
+++ b/event/default/default.js
@@ -1,5 +1,5 @@
-steal('jquery/event', 'jquery/event/handle').then(function($){
+steal('jquery/event').then(function($){
/**
* @function jQuery.fn.triggerAsync
@@ -20,7 +20,8 @@ steal('jquery/event', 'jquery/event/handle').then(function($){
* $('#other').addClass('error');
* });
*
- * triggerAsync is design to work with the [jquery.event.pause] plugin although it is defined in _jquery/event/default_.
+ * triggerAsync is design to work with the [jquery.event.pause]
+ * plugin although it is defined in _jquery/event/default_.
*
* @param {String} type The type of event
* @param {Object} data The data for the event
@@ -105,114 +106,13 @@ $event.special["default"] = {
//save the type
types[handleObj.namespace.replace(rnamespaces,"")] = true;
- //move the handler ...
- var origHandler = handleObj.handler;
- handleObj.origHandler = origHandler;
- handleObj.handler = function(ev, data){
- if(!ev._defaultActions) ev._defaultActions = [];
- ev._defaultActions.push({element: this, handler: origHandler, event: ev, data: data, currentTarget: ev.currentTarget})
- }
- },
- setup: function() {return true},
- triggerDefault : function(event, elem, data){
-
- var defaultGetter = jQuery.Event("default."+event.type);
-
- $.extend(defaultGetter,{
- target: elem,
- _defaultActions: event._defaultActions,
- exclusive : true
- });
-
- defaultGetter.stopPropagation();
-
- //default events only work on elements
- if(elem){
- // Event object or event type
- var type = defaultGetter.type || event, namespaces = [], exclusive;
-
- if (type.indexOf("!") >= 0) {
- // Exclusive events trigger only for the exact event (no namespaces)
- type = type.slice(0, -1);
- exclusive = true;
- }
-
- if (type.indexOf(".") >= 0) {
- // Namespaced trigger; create a regexp to match event type in handle()
- namespaces = type.split(".");
- type = namespaces.shift();
- namespaces.sort();
- }
- defaultGetter.type = type;
- defaultGetter.exclusive = exclusive;
-
- $event.handle.call(elem, defaultGetter, data);
- }
},
- checkAndRunDefaults : function(event, elem){
- //fire if there are default actions to run &&
- // we have not prevented default &&
- // propagation has been stopped or we are at the document element
- // we have reached the document
- if (!event.isDefaultPrevented() &&
- (!event.isPaused || !event.isPaused()) && // no paused function or it's not paused
- event._defaultActions &&
- ( ( event.isPropagationStopped() ) ||
- ( !elem.parentNode && !elem.ownerDocument ) )
-
- ) {
- var origNamespace = event.namespace,
- origType = event.type,
- origLiveFired = event.liveFired;
- // put event back
- event.namespace= event.type;
- event.type = "default";
- event.liveFired = null;
-
- // call each event handler
- for(var i = 0 ; i < event._defaultActions.length; i++){
- var a = event._defaultActions[i],
- oldHandle = event.handled;
- event.currentTarget = a.currentTarget;
- a.handler.call(a.element, event, a.data);
- event.handled = event.handled === null ? oldHandle : true;
- }
-
- event._defaultActions = null; //set to null so everyone else on this element ignores it
-
- if(event._success){
- event._success(event);
- }
-
- event.namespace= origNamespace;
- event.type = origType;
- event.liveFired = origLiveFired;
-
- }
- }
+ setup: function() {return true}
}
// overwrite trigger to allow default types
-var oldTrigger = $event.trigger,
- triggerDefault = $event.special['default'].triggerDefault,
- checkAndRunDefaults = $event.special['default'].checkAndRunDefaults,
- oldData = jQuery._data;
-
-$._data = function(elem, name, data){
- // always need to supply a function to call for handle
- if(!data && name === "handle"){
- var func = oldData.apply(this, arguments);
- return function(e){
- // Discard the second event of a jQuery.event.trigger() and
- // when an event is called after a page has unloaded
- return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
- jQuery.event.handle.apply( this, arguments ) :
- undefined;
- }
- }
- return oldData.apply(this, arguments)
-}
+var oldTrigger = $event.trigger;
$event.trigger = function defaultTriggerer( event, data, elem, onlyHandlers){
// Event object or event type
@@ -228,9 +128,26 @@ $event.trigger = function defaultTriggerer( event, data, elem, onlyHandlers){
// Just the event type (string)
new jQuery.Event( type );
- event._defaultActions = []; //set depth for possibly reused events
+ //event._defaultActions = []; //set depth for possibly reused events
+
+ var res = oldTrigger.call($.event, event, data, elem, onlyHandlers);
- oldTrigger.call($.event, event, data, elem, onlyHandlers);
+
+ if(!onlyHandlers && !event.isDefaultPrevented() && event.type.indexOf("default") !== 0){
+ oldTrigger("default."+event.type, data, elem)
+ if(event._success){
+ event._success(event)
+ }
+ }
+ // code for paused
+ if( event.isPaused && event.isPaused() ){
+ // set back original stuff
+ event.isDefaultPrevented =
+ event.pausedState.isDefaultPrevented;
+ event.isPropagationStopped =
+ event.pausedState.isPropagationStopped;
+ }
+ return res;
};
diff --git a/event/default/default_pause_test.js b/event/default/default_pause_test.js
index 6b49f415..d61f42a6 100644
--- a/event/default/default_pause_test.js
+++ b/event/default/default_pause_test.js
@@ -15,6 +15,7 @@ test("default and pause with delegate", function(){
$("#foo").delegate("#bar","show", function(ev){
order.push('show')
ev.pause();
+
setTimeout(function(){
ev.resume();
@@ -69,6 +70,7 @@ test("triggerAsync", function(){
$("#foo").live("default.show", function(){
order.push("default")
});
+
$("#foo").live("show", function(ev){
order.push('show')
ev.pause();
diff --git a/event/default/default_test.js b/event/default/default_test.js
index f593686e..13d65c8f 100644
--- a/event/default/default_test.js
+++ b/event/default/default_test.js
@@ -30,17 +30,17 @@ test("triggering defaults", function(){
touchNum = (++num)
})
$("#touchme1").trigger("touch")
- equals(1, count1, "trigger default event")
- equals(1, touchNum, "default called second")
- equals(2, defaultNum, "default called second")
+ equals(count1, 1 , "trigger default event")
+ equals(touchNum, 1, "default called second")
+ equals(defaultNum, 2, "default called second")
+ //now prevent
+ $("#bigwrapper").bind("touch", function(e){ e.preventDefault()});
- //now prevent
+ $("#touchme1").trigger("touch");
- $("#bigwrapper").bind("touch", function(e){ e.preventDefault()})
- $("#touchme1").trigger("touch")
- equals(1, count1, "default event not called")
+ equals(count1, 1 , "default event not called again"); // breaking
equals(3, touchNum, "touch called again")
var count2 = 0;
diff --git a/event/drag/drag.js b/event/drag/drag.js
index d3fba2f5..78f2dfd2 100644
--- a/event/drag/drag.js
+++ b/event/drag/drag.js
@@ -104,14 +104,14 @@ steal('jquery/event', 'jquery/lang/vector', 'jquery/event/livehack',function( $
//ev.preventDefault();
//create Drag
var drag = new $.Drag(),
- delegate = ev.liveFired || element,
+ delegate = ev.delegateTarget || element,
selector = ev.handleObj.selector,
self = this;
this.current = drag;
drag.setup({
element: element,
- delegate: ev.liveFired || element,
+ delegate: ev.delegateTarget || element,
selector: ev.handleObj.selector,
moved: false,
_distance: this.distance,
diff --git a/event/drop/drop.html b/event/drop/drop.html
index 5d4af6c6..439f11f1 100644
--- a/event/drop/drop.html
+++ b/event/drop/drop.html
@@ -41,33 +41,35 @@