All: Drop support for jQuery 1.6.x

Affects core, effects, position and widget. Only position has unit tests
that fail with jQuery 1.6 without the workaround.

Drops the 1.6.x copies jQuery of jQuery and removes them from the select
in the testsuites.

Fixes #10723
Closes gh-1422
This commit is contained in:
Jörn Zaefferer 2015-01-12 17:19:46 +01:00
parent 8cc636dd44
commit 9d0f44fd7b
20 changed files with 12 additions and 45045 deletions

View File

@ -241,21 +241,6 @@ grunt.initConfig({
"jquery/jquery.js": "jquery-1.x/jquery.js", "jquery/jquery.js": "jquery-1.x/jquery.js",
"jquery/MIT-LICENSE.txt": "jquery-1.x/MIT-LICENSE.txt", "jquery/MIT-LICENSE.txt": "jquery-1.x/MIT-LICENSE.txt",
"jquery-1.6.0/jquery.js": "jquery-1.6.0/jquery.js",
"jquery-1.6.0/MIT-LICENSE.txt": "jquery-1.6.0/MIT-LICENSE.txt",
"jquery-1.6.1/jquery.js": "jquery-1.6.1/jquery.js",
"jquery-1.6.1/MIT-LICENSE.txt": "jquery-1.6.1/MIT-LICENSE.txt",
"jquery-1.6.2/jquery.js": "jquery-1.6.2/jquery.js",
"jquery-1.6.2/MIT-LICENSE.txt": "jquery-1.6.2/MIT-LICENSE.txt",
"jquery-1.6.3/jquery.js": "jquery-1.6.3/jquery.js",
"jquery-1.6.3/MIT-LICENSE.txt": "jquery-1.6.3/MIT-LICENSE.txt",
"jquery-1.6.4/jquery.js": "jquery-1.6.4/jquery.js",
"jquery-1.6.4/MIT-LICENSE.txt": "jquery-1.6.4/MIT-LICENSE.txt",
"jquery-1.7.0/jquery.js": "jquery-1.7.0/jquery.js", "jquery-1.7.0/jquery.js": "jquery-1.7.0/jquery.js",
"jquery-1.7.0/MIT-LICENSE.txt": "jquery-1.7.0/MIT-LICENSE.txt", "jquery-1.7.0/MIT-LICENSE.txt": "jquery-1.7.0/MIT-LICENSE.txt",

View File

@ -16,11 +16,6 @@
"jshint": "2.4.4", "jshint": "2.4.4",
"qunit": "1.14.0", "qunit": "1.14.0",
"jquery-1.6.0": "jquery#1.6.0",
"jquery-1.6.1": "jquery#1.6.1",
"jquery-1.6.2": "jquery#1.6.2",
"jquery-1.6.3": "jquery#1.6.3",
"jquery-1.6.4": "jquery#1.6.4",
"jquery-1.7.0": "jquery#1.7.0", "jquery-1.7.0": "jquery#1.7.0",
"jquery-1.7.1": "jquery#1.7.1", "jquery-1.7.1": "jquery#1.7.1",
"jquery-1.7.2": "jquery#1.7.2", "jquery-1.7.2": "jquery#1.7.2",

View File

@ -1,20 +0,0 @@
Copyright (c) 2011 John Resig, http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +0,0 @@
Copyright (c) 2011 John Resig, http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +0,0 @@
Copyright (c) 2011 John Resig, http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +0,0 @@
Copyright (c) 2011 John Resig, http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +0,0 @@
Copyright (c) 2011 John Resig, http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

File diff suppressed because it is too large Load Diff

View File

@ -127,18 +127,11 @@ test( "outerHeight(true) - setter", function() {
test( "uniqueId / removeUniqueId", function() { test( "uniqueId / removeUniqueId", function() {
expect( 3 ); expect( 3 );
var el = $( "img" ).eq( 0 ); var el = $( "img" ).eq( 0 );
strictEqual( el.attr( "id" ), undefined, "element has no initial id" );
// support: jQuery <1.6.2
// support: IE <8
// We should use strictEqual( id, undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
ok( !el.attr( "id" ), "element has no initial id" );
el.uniqueId(); el.uniqueId();
ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" ); ok( /ui-id-\d+$/.test( el.attr( "id" ) ), "element has generated id" );
el.removeUniqueId(); el.removeUniqueId();
// support: jQuery <1.6.2 strictEqual( el.attr( "id" ), undefined, "unique id has been removed from element" );
// support: IE <8
// see above
ok( !el.attr( "id" ), "unique id has been removed from element" );
}); });
})( jQuery ); })( jQuery );

View File

@ -64,9 +64,9 @@ QUnit.config.urlConfig.push({
id: "jquery", id: "jquery",
label: "jQuery version", label: "jQuery version",
value: [ value: [
"1.6.0", "1.6.1", "1.6.2", "1.6.3", "1.6.4", "1.7.0", "1.7.1", "1.7.2", "1.7.0", "1.7.1", "1.7.2", "1.8.0", "1.8.1", "1.8.2", "1.8.3",
"1.8.0", "1.8.1", "1.8.2", "1.8.3", "1.9.0", "1.9.1", "1.10.0", "1.9.0", "1.9.1", "1.10.0", "1.10.1", "1.10.2", "2.0.0",
"1.10.1", "1.10.2", "2.0.0", "2.0.1", "2.0.2", "2.0.3", "git" "2.0.1", "2.0.2", "2.0.3", "git"
], ],
tooltip: "Which jQuery Core version to test against" tooltip: "Which jQuery Core version to test against"
}); });

View File

@ -39,10 +39,7 @@ test( "accessibility", function() {
"multiple describedby when open" ); "multiple describedby when open" );
// strictEqual to distinguish between .removeAttr( "title" ) and .attr( "title", "" ) // strictEqual to distinguish between .removeAttr( "title" ) and .attr( "title", "" )
// support: jQuery <1.6.2 strictEqual( element.attr( "title" ), undefined, "no title when open" );
// support: IE <8
// We should use strictEqual( ..., undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
ok( !element.attr( "title" ), "no title when open" );
equal( liveRegion.children().length, 1 ); equal( liveRegion.children().length, 1 );
equal( liveRegion.children().last().html(), "..." ); equal( liveRegion.children().last().html(), "..." );
element.tooltip( "close" ); element.tooltip( "close" );

View File

@ -70,11 +70,7 @@ test( "enable/disable", function() {
ok( !element.tooltip( "widget" ).hasClass( "ui-state-disabled" ), "element doesn't get ui-state-disabled" ); ok( !element.tooltip( "widget" ).hasClass( "ui-state-disabled" ), "element doesn't get ui-state-disabled" );
ok( !element.tooltip( "widget" ).attr( "aria-disabled" ), "element doesn't get aria-disabled" ); ok( !element.tooltip( "widget" ).attr( "aria-disabled" ), "element doesn't get aria-disabled" );
ok( !element.tooltip( "widget" ).hasClass( "ui-tooltip-disabled" ), "element doesn't get ui-tooltip-disabled" ); ok( !element.tooltip( "widget" ).hasClass( "ui-tooltip-disabled" ), "element doesn't get ui-tooltip-disabled" );
strictEqual( tooltip.attr( "title" ), undefined, "title removed on disable" );
// support: jQuery <1.6.2
// support: IE <8
// We should use strictEqual( ..., undefined ) when dropping jQuery 1.6.1 support (or IE6/7)
ok( !tooltip.attr( "title" ), "title removed on disable" );
element.tooltip( "open" ); element.tooltip( "open" );
equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" ); equal( $( ".ui-tooltip" ).length, 0, "open does nothing when disabled" );
@ -123,7 +119,7 @@ test( "preserve changes to title attributes on close and destroy", function() {
tests[ 5 ] = { expected: original, method: "destroy" }; tests[ 5 ] = { expected: original, method: "destroy" };
$.each( tests, function( index, test ) { $.each( tests, function( index, test ) {
element.attr( "title", original ).tooltip() element.attr( "title", original ).tooltip()
.tooltip( "open", $.Event( "mouseover", { target: element[ 0 ] } ) ); .tooltip( "open", $.Event( "mouseover", { target: element[ 0 ] } ) );
if ( test.title ) { if ( test.title ) {
@ -133,7 +129,7 @@ test( "preserve changes to title attributes on close and destroy", function() {
} }
element.tooltip( test.method ); element.tooltip( test.method );
equal( $( "#tooltipped1" ).attr( "title" ), test.expected ); equal( $( "#tooltipped1" ).attr( "title" ), test.expected );
} ); } );
}); });

View File

@ -198,19 +198,6 @@ if ( !$.fn.addBack ) {
}; };
} }
// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
$.fn.removeData = (function( removeData ) {
return function( key ) {
if ( arguments.length ) {
return removeData.call( this, $.camelCase( key ) );
} else {
return removeData.call( this );
}
};
})( $.fn.removeData );
}
// deprecated // deprecated
$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() ); $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );

View File

@ -936,14 +936,6 @@ if ( $.uiBackCompat !== false ) {
for ( ; i < length; i++ ) { for ( ; i < length; i++ ) {
if ( set[ i ] !== null ) { if ( set[ i ] !== null ) {
val = element.data( dataSpace + set[ i ] ); val = element.data( dataSpace + set[ i ] );
// support: jQuery 1.6.2
// http://bugs.jquery.com/ticket/9917
// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
// We can't differentiate between "" and 0 here, so we just assume
// empty string since it's likely to be a more common value...
if ( val === undefined ) {
val = "";
}
element.css( set[ i ], val ); element.css( set[ i ], val );
} }
} }

View File

@ -130,11 +130,8 @@ $.position = {
offset: withinElement.offset() || { left: 0, top: 0 }, offset: withinElement.offset() || { left: 0, top: 0 },
scrollLeft: withinElement.scrollLeft(), scrollLeft: withinElement.scrollLeft(),
scrollTop: withinElement.scrollTop(), scrollTop: withinElement.scrollTop(),
width: withinElement.outerWidth(),
// support: jQuery 1.6.x height: withinElement.outerHeight()
// jQuery 1.6 doesn't support .outerWidth/Height() on documents or windows
width: isWindow || isDocument ? withinElement.width() : withinElement.outerWidth(),
height: isWindow || isDocument ? withinElement.height() : withinElement.outerHeight()
}; };
} }
}; };

View File

@ -302,10 +302,7 @@ $.Widget.prototype = {
// all event bindings should go through this._on() // all event bindings should go through this._on()
this.element this.element
.unbind( this.eventNamespace ) .unbind( this.eventNamespace )
.removeData( this.widgetFullName ) .removeData( this.widgetFullName );
// support: jquery <1.6.3
// http://bugs.jquery.com/ticket/9413
.removeData( $.camelCase( this.widgetFullName ) );
this.widget() this.widget()
.unbind( this.eventNamespace ) .unbind( this.eventNamespace )
.removeAttr( "aria-disabled" ) .removeAttr( "aria-disabled" )