Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Getting ready for 1.0a.

  • Loading branch information...
commit 73f55becc5e056ad28f6aec22ec014ffb3ab913b 1 parent 6bf8667
@jeresig jeresig authored
Showing with 56 additions and 11 deletions.
  1. +0 −1  build.bat
  2. +1 −1  build.sh
  3. +13 −0 form/form.js
  4. +42 −9 jquery/jquery.js
View
1  build.bat
@@ -3,4 +3,3 @@ type jquery\jquery.js > jquery-svn.js
type fx\fx.js >> jquery-svn.js
type event\event.js >> jquery-svn.js
type ajax\ajax.js >> jquery-svn.js
-type form\form.js >> jquery-svn.js
View
2  build.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-cat jquery/jquery.js event/event.js fx/fx.js ajax/ajax.js form/form.js > jquery-svn.js
+cat jquery/jquery.js event/event.js fx/fx.js ajax/ajax.js > jquery-svn.js
View
13 form/form.js
@@ -127,6 +127,19 @@ $.fn.ajaxForm = function(target, post_cb, pre_cb) {
});
};
+/*
+
+$.ajax({
+ type: "POST",
+ url: "foo.cgi",
+ data: $.param( $("form").formdata() ),
+ success: function(){},
+ error: function(){},
+ complete: function(){}
+});
+
+ */
+
/**
* A simple wrapper function that sits around the .serialize()
* method, allowing you to easily extract the data stored within
View
51 jquery/jquery.js
@@ -1,5 +1,5 @@
/*
- * jQuery
+ * jQuery - New Wave Javascript
*
* Copyright (c) 2006 John Resig (jquery.com)
* Licensed under the MIT License:
@@ -17,9 +17,15 @@ window.undefined = window.undefined;
* @constructor
*/
function jQuery(a,c) {
+ // Watch for when a jQuery object is passed in as an arg
+ if ( a && a.jquery )
+ return a;
+
+ // If the context is global, return a new object
if ( window == this )
return new jQuery(a,c);
+ // Find the matching elements and save them for later
this.cur = jQuery.Select(
a || jQuery.context || document,
c && c.jquery && c.get(0) || c
@@ -29,7 +35,33 @@ function jQuery(a,c) {
/**
* The jQuery query object.
*/
-var $ = jQuery;
+if ( !window.$ )
+ var $ = jQuery;
+
+/*
+ * Handle support for overriding other $() functions. Way too many libraries
+ * provide this function to simply ignore it and overwrite it.
+ */
+else
+ var $ = function(a,c) {
+ // Check to see if this is a possible collision case
+ if ( !c && a.constructor == String &&
+
+ // Make sure that the expression is a colliding one
+ !/[^a-zA-Z0-9_-]/.test(a) &&
+
+ // and that there are no elements that match it
+ // (this is the one truly ambiguous case)
+ !document.getElementsByTagName(a).length ) {
+
+ // Only return the element if it's found
+ var obj = document.getElementById(a);
+ if ( obj ) return obj;
+
+ }
+
+ return jQuery(a,c);
+ };
jQuery.fn = jQuery.prototype = {
/**
@@ -67,7 +99,7 @@ jQuery.fn = jQuery.prototype = {
},
set: function(a,b) {
return this.each(function(){
- if ( b == undefined )
+ if ( b === undefined )
for ( var j in a )
jQuery.attr(this,j,a[j]);
else
@@ -94,9 +126,9 @@ jQuery.fn = jQuery.prototype = {
},
css: function(a,b) {
- return a.constructor != String || b ?
+ return a.constructor != String || b ?
this.each(function(){
- if ( !b )
+ if ( b === undefined )
for ( var j in a )
jQuery.attr(this.style,j,a[j]);
else
@@ -457,9 +489,9 @@ jQuery.g = {
empty: "!a.childNodes.length",
root: "a==(a.ownerDocument||document).documentElement",
contains: "(a.innerText||a.innerHTML).indexOf(m[3])!=-1",
- visible: "(!a.type||a.type!='hidden')&&(jQuery.css(a,'display')!= 'none'&&jQuery.css(a,'visibility')!= 'hidden')",
- hidden: "(a.type&&a.type == 'hidden')||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')== 'hidden'",
- enabled: "a.disabled==false",
+ visible: "(!a.type||a.type!='hidden')&&(jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!= 'hidden')",
+ hidden: "(a.type&&a.type=='hidden')||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')== 'hidden'",
+ enabled: "!a.disabled",
disabled: "a.disabled",
checked: "a.checked"
},
@@ -493,7 +525,8 @@ jQuery.token = [
jQuery.Select = function( t, context ) {
context = context || jQuery.context || document;
- if ( t.constructor != String ) return [t];
+ if ( t.constructor != String )
+ return t.constructor == Array ? t : [t];
if ( !t.indexOf("//") ) {
context = context.documentElement;
Please sign in to comment.
Something went wrong with that request. Please try again.