8000 Upgrade vendored jQuery UI to 1.14.1 · activeadmin/activeadmin@5e4e6c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5e4e6c8

Browse files
taglialatagliala
committed
Upgrade vendored jQuery UI to 1.14.1
JavaScript files have been manually updated because: - `jquery-ui-rails` is unmaintained and it is bundling 1.13.0 - An active fork of `jquery-ui-rails` is bundling 1.13.2, but there is a more recent version (1.13.3) Files removed because they have been dropped from jQuery UI: - form.js - ie.js - safe-active-element.js - safe-blur.js Refs: - #8656 - https://jqueryui.com/upgrade-guide/1.14/#removed-apis
1 parent edcfa52 commit 5e4e6c8

28 files changed

+187
-344
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Unreleased
44

5+
* Update vendored jQuery UI to 1.14.1 [#8670] by [@tagliala] (thanks to [@tobischo])
6+
57
## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)
68

79
### Enhancements
@@ -984,6 +986,7 @@ Please check [0-6-stable] for previous changes.
984986
[#8614]: https://github.com/activeadmin/activeadmin/pull/8614
985987
[#8650]: https://github.com/activeadmin/activeadmin/pull/8650
986988
[#8652]: https://github.com/activeadmin/activeadmin/pull/8652
989+
[#8670]: https://github.com/activeadmin/activeadmin/pull/8670
987990

988991
[@1000ship]: https://github.com/1000ship
989992
[@5t111111]: https://github.com/5t111111
@@ -1108,6 +1111,7 @@ Please check [0-6-stable] for previous changes.
11081111
[@timoschilling]: https://github.com/timoschilling
11091112
[@TimPetricola]: https://github.com/TimPetricola
11101113
[@timwis]: https://github.com/timwis
1114+
[@tobischo]: https://github.com/tobischo
11111115
[@tomgilligan]: https://github.com/tomgilligan
11121116
[@TonyArra]: https://github.com/TonyArra
11131117
[@tordans]: https://github.com/tordans

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"dependencies": {
4646
"jquery": "^3.4.1",
47-
"jquery-ui": "^1.13.3",
47+
"jquery-ui": "^1.14.1",
4848
"jquery-ujs": "^1.2.2"
4949
}
5050
}

‎vendor/assets/javascripts/jquery-ui/data.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//= require jquery-ui/version
22

33
/*!
4-
* jQuery UI :data 1.13.3
4+
* jQuery UI :data 1.14.1
55
* https://jqueryui.com
66
*
77
* Copyright OpenJS Foundation and other contributors
@@ -30,16 +30,10 @@
3030
"use strict";
3131

3232
return $.extend( $.expr.pseudos, {
33-
data: $.expr.createPseudo ?
34-
$.expr.createPseudo( function( dataName ) {
35-
return function( elem ) {
36-
return !!$.data( elem, dataName );
37-
};
38-
} ) :
39-
40-
// Support: jQuery <1.8
41-
function( elem, i, match ) {
42-
return !!$.data( elem, match[ 3 ] );
43-
}
33+
data: $.expr.createPseudo( function( dataName ) {
34+
return function( elem ) {
35+
return !!$.data( elem, dataName );
36+
};
37+
} )
4438
} );
4539
} );

‎vendor/assets/javascripts/jquery-ui/disable-selection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//= require jquery-ui/version
22

33
/*!
4-
* jQuery UI Disable Selection 1.13.3
4+
* jQuery UI Disable Selection 1.14.1
55
* https://jqueryui.com
66
*
77
* Copyright OpenJS Foundation and other contributors

‎vendor/assets/javascripts/jquery-ui/focusable.js

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//= require jquery-ui/version
22

33
/*!
4-
* jQuery UI Focusable 1.13.3
4+
* jQuery UI Focusable 1.14.1
55
* https://jqueryui.com
66
*
77
* Copyright OpenJS Foundation and other contributors
@@ -64,20 +64,10 @@ $.ui.focusable = function( element, hasTabindex ) {
6464
focusableIfVisible = hasTabindex;
6565
}
6666

67-
return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
67+
return focusableIfVisible && $( element ).is( ":visible" ) &&
68+
$( element ).css( "visibility" ) === "visible";
6869
};
6970

70-
// Support: IE 8 only
71-
// IE 8 doesn't resolve inherit to visible/hidden for computed values
72-
function visible( element ) {
73-
var visibility = element.css( "visibility" );
74-
while ( visibility === "inherit" ) {
75-
element = element.parent();
76-
visibility = element.css( "visibility" );
77-
}
78-
return visibility === "visible";
79-
}
80-
8171
$.extend( $.expr.pseudos, {
8272
focusable: function( element ) {
8373
return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );

‎vendor/assets/javascripts/jquery-ui/form-reset-mixin.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
//= require jquery-ui/form
2-
//= require jquery-ui/version
3-
41
/*!
5-
* jQuery UI Form Reset Mixin 1.13.3
2+
* jQuery UI Form Reset Mixin 1.14.1
63
* https://jqueryui.com
74
*
85
* Copyright OpenJS Foundation and other contributors
@@ -23,7 +20,6 @@
2320
// AMD. Register as an anonymous module.
2421
define( [
2522
"jquery",
26-
"./form",
2723
"./version"
2824
], factory );
2925
} else {
@@ -48,7 +44,7 @@ return $.ui.formResetMixin = {
4844
},
4945

5046
_bindFormResetHandler: function() {
51-
this.form = this.element._form();
47+
this.form = $( this.element.prop( "form" ) );
5248
if ( !this.form.length ) {
5349
return;
5450
}

‎vendor/assets/javascripts/jquery-ui/form.js

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎vendor/assets/javascripts/jquery-ui/ie.js

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎vendor/assets/javascripts/jquery-ui/keycode.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//= require jquery-ui/version
22

33
/*!
4-
* jQuery UI Keycode 1.13.3
4+
* jQuery UI Keycode 1.14.1
55
* https://jqueryui.com
66
*
77
* Copyright OpenJS Foundation and other contributors

‎vendor/assets/javascripts/jquery-ui/labels.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//= require jquery-ui/version
22

33
/*!
4-
* jQuery UI Labels 1.13.3
4+
* jQuery UI Labels 1.14.1
55
* https://jqueryui.com
66
*
77
* Copyright OpenJS Foundation and other contributors
@@ -41,9 +41,8 @@ return $.fn.labels = function() {
4141
return this.pushStack( this[ 0 ].labels );
4242
}
4343

44-
// Support: IE <= 11, FF <= 37, Android <= 2.3 only
45-
// Above browsers do not support control.labels. Everything below is to support them
46-
// as well as document fragments. control.labels does not work on document fragments
44+
// If `control.labels` is empty - e.g. inside of document fragments - find
45+
// the labels manually
4746
labels = this.eq( 0 ).parents( "label" );
4847

4948
// Look for the label based on the id
@@ -58,7 +57,7 @@ return $.fn.labels = function() {
5857
ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
5958

6059
// Create a selector for the label based on the id
61-
selector = "label[for='" + $.escapeSelector( id ) + "']";
60+
selector = "label[for='" + CSS.escape( id ) + "']";
6261

6362
labels = labels.add( ancestors.find( selector ).addBack( selector ) );
6463

0 commit comments

Comments
 (0)
0