deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into csshooks

Browse source 
Conflicts:
	src/css.js
This commit is contained in:
jeresig 2010-09-09 15:35:18 -04:00
parent ad950c8c59 1ed405176b
commit 194c93eca2
4 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -56,6 +56,8 @@ ${JQ}: selector ${MODULES}
@@mkdir -p ${DIST_DIR} @@mkdir -p ${DIST_DIR}
@@cat ${MODULES} | \ @@cat ${MODULES} | \
sed 's/.function..jQuery...{//' | \
sed 's/}...jQuery..;//' | \
sed 's/Date:./&'"${DATE}"'/' | \ sed 's/Date:./&'"${DATE}"'/' | \
${VER} > ${JQ}; ${VER} > ${JQ};

6
src/core.js
View file

@ -1,4 +1,4 @@
(function() { var jQuery = (function() {
// Define a local copy of jQuery // Define a local copy of jQuery
var jQuery = function( selector, context ) { var jQuery = function( selector, context ) {
@ -109,7 +109,7 @@ jQuery.fn = jQuery.prototype = {
} }
} else { } else {
ret = buildFragment( [ match[1] ], [ doc ] ); ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes; selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
} }
@ -826,6 +826,6 @@ function doScrollCheck() {
} }
// Expose jQuery to the global object // Expose jQuery to the global object
window.jQuery = window.$ = jQuery; return window.jQuery = window.$ = jQuery;
})(); })();

4
src/event.js
View file

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

8
src/manipulation.js
View file

@ -327,7 +327,7 @@ jQuery.fn.extend({
results = { fragment: parent }; results = { fragment: parent };
} else { } else {
results = buildFragment( args, this, scripts ); results = jQuery.buildFragment( args, this, scripts );
} }
fragment = results.fragment; 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, var fragment, cacheable, cacheresults,
doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document); doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
@ -422,7 +422,7 @@ function buildFragment( args, nodes, scripts ) {
} }
return { fragment: fragment, cacheable: cacheable }; return { fragment: fragment, cacheable: cacheable };
} };
jQuery.fragments = {}; jQuery.fragments = {};
@ -569,7 +569,7 @@ jQuery.extend({
jQuery.event.remove( elem, type ); jQuery.event.remove( elem, type );
} else { } else {
removeEvent( elem, type, data.handle ); jQuery.removeEvent( elem, type, data.handle );
} }
} }
} }