Merge branch 'master' into csshooks

Conflicts:
	src/css.js

4 files changed, 11 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 0fff724c1..d11d4e1ff 100644
--- a/Makefile
+++ b/Makefile
@@ -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};
 
diff --git a/src/core.js b/src/core.js
index f5c27561b..d6ef236f4 100644
--- a/src/core.js
+++ b/src/core.js
@@ -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;
 
 })();
diff --git a/src/event.js b/src/event.js
index f0b27de43..5e72aaaab 100644
--- a/src/event.js
+++ b/src/event.js
@@ -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 );
diff --git a/src/manipulation.js b/src/manipulation.js
index 3054eea1d..c3b8f6d0f 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -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 );
 						}
 					}
 				}