Skip to content
Permalink
Browse files

merge with master and resolve more conflicts

  • Loading branch information
louisremi
louisremi committed Apr 12, 2011
2 parents 8547b34 + 312df04 commit a5604aedb74ec39624b21229a5c8542c793b0382
Showing with 321 additions and 86 deletions.
  1. +1 −1 Makefile
  2. +4 −4 README.md
  3. +1 −1 src/attributes.js
  4. +5 −2 src/core.js
  5. +18 −7 src/css.js
  6. +14 −3 src/effects.js
  7. +13 −13 src/event.js
  8. +5 −3 src/offset.js
  9. +62 −33 src/queue.js
  10. +6 −3 src/support.js
  11. +8 −3 src/traversing.js
  12. +1 −1 test/data/testsuite.css
  13. +8 −1 test/unit/core.js
  14. +19 −2 test/unit/css.js
  15. +1 −1 test/unit/effects.js
  16. +21 −0 test/unit/event.js
  17. +27 −1 test/unit/offset.js
  18. +106 −5 test/unit/queue.js
  19. +1 −2 test/unit/traversing.js
@@ -111,7 +111,7 @@ update_submodules:

# update the submodules to the latest at the most logical branch
pull_submodules:
@@git submodule foreach "git pull origin \$$(git branch --no-color --contains \$$(git rev-parse HEAD) | grep -v \( | head -1)"
@@git submodule foreach "git pull \$$(git config remote.origin.url)"
@@git submodule summary

pull: pull_submodules
@@ -63,7 +63,7 @@ As the source code is handled by the version control system Git, it's useful to

### Submodules ###

The repository uses submodules, which normally are handles directly by the Makefile, but sometimes you want to
The repository uses submodules, which normally are handled directly by the Makefile, but sometimes you want to
be able to work with them manually.

Following are the steps to manually get the submodules:
@@ -86,7 +86,7 @@ If you want to work inside a submodule, it is possible, but first you need to ch
1. `cd src/sizzle`
2. `git checkout master`

After you've commited your changes to the submodule, you'll update the jquery project to point to the new commit,
After you've committed your changes to the submodule, you'll update the jquery project to point to the new commit,
but remember to push the submodule changes before pushing the new jquery commit:

1. `cd src/sizzle`
@@ -99,12 +99,12 @@ The makefile has some targets to simplify submodule handling:

#### `make update_submodules` ####

checks out the commit pointed to byu jquery, but merges your local changes, if any. This target is executed
checks out the commit pointed to by jquery, but merges your local changes, if any. This target is executed
when you are doing a normal `make`.

#### `make pull_submodules` ####

updates the content of the submoduels to what is probably the latest upstream code
updates the content of the submodules to what is probably the latest upstream code.

#### `make pull` ####

@@ -479,7 +479,7 @@ jQuery.each([ "selected", "checked", "readOnly", "disabled" ], function( i, name

// Some attributes require a special call on IE
if ( !jQuery.support.hrefNormalized ) {
jQuery.each([ "href", "src", "width", "height", "list" ], function( i, name ) {
jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
get: function( elem ) {
var ret = elem.getAttribute( name, 2 );
@@ -613,8 +613,11 @@ jQuery.extend({
}
}
} else {
for ( var value = object[0];
i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
for ( ; i < length; ) {
if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
break;
}
}
}
}

@@ -122,19 +122,25 @@ jQuery.extend({
},

css: function( elem, name, extra ) {
var ret, hooks;

// Make sure that we're working with the right name
var ret, origName = jQuery.camelCase( name ),
hooks = jQuery.cssHooks[ origName ];
name = jQuery.camelCase( name );
hooks = jQuery.cssHooks[ name ];
name = jQuery.cssProps[ name ] || name;

name = jQuery.cssProps[ origName ] || origName;
// cssFloat needs a special treatment
if ( name === "cssFloat" ) {
name = "float";
}

// If a hook was provided get the computed value from there
if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
return ret;

// Otherwise, if a way to get the computed value exists, use that
} else if ( curCSS ) {
return curCSS( elem, name, origName );
return curCSS( elem, name );
}
},

@@ -231,7 +237,8 @@ if ( !jQuery.support.opacity ) {
},

set: function( elem, value ) {
var style = elem.style;
var style = elem.style,
currentStyle = elem.currentStyle;

// IE has trouble with opacity if it does not have layout
// Force it by setting the zoom level
@@ -241,11 +248,15 @@ if ( !jQuery.support.opacity ) {
var opacity = jQuery.isNaN(value) ?
"" :
"alpha(opacity=" + value * 100 + ")",
filter = style.filter || "";
filter = currentStyle && currentStyle.filter || style.filter || "";

style.filter = ralpha.test(filter) ?
filter.replace(ralpha, opacity) :
<<<<<<< HEAD
style.filter + " " + opacity;
=======
filter + " " + opacity;
>>>>>>> 312df0441b16981dd697d74fcbc1e1f212b47b7e
}
};
}
@@ -273,7 +284,7 @@ jQuery(function() {
});

if ( document.defaultView && document.defaultView.getComputedStyle ) {
getComputedStyle = function( elem, newName, name ) {
getComputedStyle = function( elem, name ) {
var ret, defaultView, computedStyle;

name = name.replace( rupper, "-$1" ).toLowerCase();
@@ -121,13 +121,17 @@ jQuery.fn.extend({
var optall = jQuery.speed(speed, easing, callback);

if ( jQuery.isEmptyObject( prop ) ) {
return this.each( optall.complete );
return this.each( optall.complete, [ false ] );
}

return this[ optall.queue === false ? "each" : "queue" ](function() {
// XXX 'this' does not always have a nodeName when running the
// test suite

if ( optall.queue === false ) {
jQuery._mark( this );
}

var opt = jQuery.extend({}, optall), p,
isElement = this.nodeType === 1,
hidden = isElement && jQuery(this).is(":hidden"),
@@ -237,6 +241,10 @@ jQuery.fn.extend({
}

this.each(function() {
// clear marker counters if we know they won't be
if ( !gotoEnd ) {
jQuery._unmark( true, this );
}
// go in reverse order so anything added to the queue during the loop is ignored
for ( var i = timers.length - 1; i >= 0; i-- ) {
if ( timers[i].elem === this ) {
@@ -298,10 +306,13 @@ jQuery.extend({

// Queueing
opt.old = opt.complete;
opt.complete = function() {
opt.complete = function( noUnmark ) {
if ( opt.queue !== false ) {
jQuery(this).dequeue();
jQuery.dequeue( this );
} else if ( noUnmark !== false ) {
jQuery._unmark( this );
}

if ( jQuery.isFunction( opt.old ) ) {
opt.old.call( this );
}
@@ -24,17 +24,6 @@ jQuery.event = {
return;
}

// TODO :: Use a try/catch until it's safe to pull this out (likely 1.6)
// Minor release fix for bug #8018
try {
// For whatever reason, IE has trouble passing the window object
// around, causing it to be cloned in the process
if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
elem = window;
}
}
catch ( e ) {}

if ( handler === false ) {
handler = returnFalse;
} else if ( !handler ) {
@@ -304,7 +293,7 @@ jQuery.event = {
}
event.namespace = namespaces.join(".");
event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");

// Handle a global trigger
if ( !elem ) {
// Don't bubble custom events when global (to avoid too much overhead)
@@ -574,6 +563,9 @@ jQuery.Event = function( src ) {
}
}

// Always ensure a type has been explicitly set
this.type = src.type;

// Events bubbling up the document may have been marked as prevented
// by a handler lower down the tree; reflect the correct value.
this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
@@ -1030,10 +1022,18 @@ jQuery.each(["live", "die"], function( i, name ) {
return this;
}

if ( name === "die" && !types &&
origSelector && origSelector[0] === "." ) {

context.unbind( origSelector );

return this;
}

if ( data === false || jQuery.isFunction( data ) ) {
fn = data || returnFalse;
data = undefined;
}
}

types = (types || "").split(" ");

@@ -186,11 +186,13 @@ jQuery.offset = {
// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
if ( calculatePosition ) {
curPosition = curElem.position();
curTop = curPosition.top;
curLeft = curPosition.left;
} else {
curTop = parseFloat( curCSSTop ) || 0;
curLeft = parseFloat( curCSSLeft ) || 0;
}

curTop = calculatePosition ? curPosition.top : parseInt( curCSSTop, 10 ) || 0;
curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0;

if ( jQuery.isFunction( options ) ) {
options = options.call( elem, i, curOffset );
}

0 comments on commit a5604ae

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