Skip to content
Permalink
Browse files

Merge branch 'master' into csshooks

Conflicts:
	src/css.js
  • Loading branch information
jeresig committed Sep 9, 2010
2 parents ad950c8 + 1ed4051 commit 194c93eca2c3cfccbf74236587537d9892d88b1d
Showing with 11 additions and 9 deletions.
  1. +2 −0 Makefile
  2. +3 −3 src/core.js
  3. +2 −2 src/event.js
  4. +4 −4 src/manipulation.js
@@ -56,6 +56,8 @@ ${JQ}: selector ${MODULES}
@@mkdir -p ${DIST_DIR}

@@cat ${MODULES} | \
sed 's/.function..jQuery...{//' | \
sed 's/}...jQuery..;//' | \
sed 's/Date:./&'"${DATE}"'/' | \
${VER} > ${JQ};

@@ -1,4 +1,4 @@
(function() {
var jQuery = (function() {

// Define a local copy of jQuery
var jQuery = function( selector, context ) {
@@ -109,7 +109,7 @@ jQuery.fn = jQuery.prototype = {
}

} else {
ret = buildFragment( [ match[1] ], [ doc ] );
ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
}

@@ -826,6 +826,6 @@ function doScrollCheck() {
}

// Expose jQuery to the global object
window.jQuery = window.$ = jQuery;
return window.jQuery = window.$ = jQuery;

})();
@@ -239,7 +239,7 @@ jQuery.event = {
// remove generic event handler if no more handlers exist
if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
removeEvent( elem, type, elemData.handle );
jQuery.removeEvent( elem, type, elemData.handle );
}

ret = null;
@@ -527,7 +527,7 @@ jQuery.event = {
}
};

var removeEvent = document.removeEventListener ?
jQuery.removeEvent = document.removeEventListener ?
function( elem, type, handle ) {
if ( elem.removeEventListener ) {
elem.removeEventListener( type, handle, false );
@@ -327,7 +327,7 @@ jQuery.fn.extend({
results = { fragment: parent };

} else {
results = buildFragment( args, this, scripts );
results = jQuery.buildFragment( args, this, scripts );
}

fragment = results.fragment;
@@ -392,7 +392,7 @@ function cloneCopyEvent(orig, ret) {
});
}

function buildFragment( args, nodes, scripts ) {
jQuery.buildFragment = function( args, nodes, scripts ) {
var fragment, cacheable, cacheresults,
doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);

@@ -422,7 +422,7 @@ function buildFragment( args, nodes, scripts ) {
}

return { fragment: fragment, cacheable: cacheable };
}
};

jQuery.fragments = {};

@@ -569,7 +569,7 @@ jQuery.extend({
jQuery.event.remove( elem, type );

} else {
removeEvent( elem, type, data.handle );
jQuery.removeEvent( elem, type, data.handle );
}
}
}

0 comments on commit 194c93e

Please sign in to comment.
You can’t perform that action at this time.