Skip to content

J
jquery
Commit 1844f95c authored by Brandon Aaron's avatar Brandon Aaron
Browse files
Options

Added unit tests for setting offset one property at a time and added radix to parseInt calls

parent ba8938d4
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 7 deletions
test/unit/offset.js
View file @ 1844f95c
...@@ -35,7 +35,7 @@ testoffset("absolute"/* in iframe */, function($, iframe) { ...@@ -35,7 +35,7 @@ testoffset("absolute"/* in iframe */, function($, iframe) {
}); });
testoffset("absolute", function( jQuery ) { testoffset("absolute", function( jQuery ) {
expect(144); expect(176);
// get offset tests // get offset tests
var tests = [ var tests = [
...@@ -94,8 +94,13 @@ testoffset("absolute", function( jQuery ) { ...@@ -94,8 +94,13 @@ testoffset("absolute", function( jQuery ) {
equals( val.left, left, "Verify incoming top position." ); equals( val.left, left, "Verify incoming top position." );
return { top: top + 1, left: left + 1 }; return { top: top + 1, left: left + 1 };
}); });
equals( jQuery( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" ); equals( jQuery( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + (this.top + 1) + " })" );
equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" ); equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + (this.left + 1) + " })" );
jQuery( this.id ).offset({ top: this.top + 2 });
jQuery( this.id ).offset({ left: this.left + 2 });
equals( jQuery( this.id ).offset().top, this.top + 2, "Setting one property at a time." );
equals( jQuery( this.id ).offset().left, this.left + 2, "Setting one property at a time." );
jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) { jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
jQuery( this ).css({ jQuery( this ).css({
...@@ -112,7 +117,7 @@ testoffset("relative", function( jQuery ) { ...@@ -112,7 +117,7 @@ testoffset("relative", function( jQuery ) {
expect(60); expect(60);
// IE is collapsing the top margin of 1px // IE is collapsing the top margin of 1px
var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8; var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
// get offset // get offset
var tests = [ var tests = [
...@@ -173,7 +178,7 @@ testoffset("static", function( jQuery ) { ...@@ -173,7 +178,7 @@ testoffset("static", function( jQuery ) {
expect(80); expect(80);
// IE is collapsing the top margin of 1px // IE is collapsing the top margin of 1px
var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8; var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
// get offset // get offset
var tests = [ var tests = [
...@@ -302,7 +307,7 @@ testoffset("table", function( jQuery ) { ...@@ -302,7 +307,7 @@ testoffset("table", function( jQuery ) {
testoffset("scroll", function( jQuery, win ) { testoffset("scroll", function( jQuery, win ) {
expect(16); expect(16);
var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8; var ie = jQuery.browser.msie && parseInt( jQuery.browser.version, 10 ) < 8;
// IE is collapsing the top margin of 1px // IE is collapsing the top margin of 1px
equals( jQuery('#scroll-1').offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" ); equals( jQuery('#scroll-1').offset().top, ie ? 6 : 7, "jQuery('#scroll-1').offset().top" );
...@@ -404,7 +409,7 @@ function testoffset(name, fn) { ...@@ -404,7 +409,7 @@ function testoffset(name, fn) {
}); });
function loadFixture() { function loadFixture() {
var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000 ), var src = './data/offset/' + name + '.html?' + parseInt( Math.random()*1000, 10 ),
iframe = jQuery('<iframe />').css({ iframe = jQuery('<iframe />').css({
width: 500, height: 500, position: 'absolute', top: -600, left: -600, visiblity: 'hidden' width: 500, height: 500, position: 'absolute', top: -600, left: -600, visiblity: 'hidden'
}).appendTo('body')[0]; }).appendTo('body')[0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment