🌐 AI搜索 & 代理 主页
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Unreleased

* Update vendored jQuery UI to 1.14.1 [#8670] by [@tagliala] (thanks to [@tobischo])

## 3.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v3.2.5..v3.3.0)

### Enhancements
Expand Down Expand Up @@ -984,6 +986,7 @@ Please check [0-6-stable] for previous changes.
[#8614]: https://github.com/activeadmin/activeadmin/pull/8614
[#8650]: https://github.com/activeadmin/activeadmin/pull/8650
[#8652]: https://github.com/activeadmin/activeadmin/pull/8652
[#8670]: https://github.com/activeadmin/activeadmin/pull/8670

[@1000ship]: https://github.com/1000ship
[@5t111111]: https://github.com/5t111111
Expand Down Expand Up @@ -1108,6 +1111,7 @@ Please check [0-6-stable] for previous changes.
[@timoschilling]: https://github.com/timoschilling
[@TimPetricola]: https://github.com/TimPetricola
[@timwis]: https://github.com/timwis
[@tobischo]: https://github.com/tobischo
[@tomgilligan]: https://github.com/tomgilligan
[@TonyArra]: https://github.com/TonyArra
[@tordans]: https://github.com/tordans
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
},
"dependencies": {
"jquery": "^3.4.1",
"jquery-ui": "^1.13.3",
"jquery-ui": "^1.14.1",
"jquery-ujs": "^1.2.2"
}
}
18 changes: 6 additions & 12 deletions vendor/assets/javascripts/jquery-ui/data.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI :data 1.13.3
* jQuery UI :data 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down Expand Up @@ -30,16 +30,10 @@
"use strict";

return $.extend( $.expr.pseudos, {
data: $.expr.createPseudo ?
$.expr.createPseudo( function( dataName ) {
return function( elem ) {
return !!$.data( elem, dataName );
};
} ) :

// Support: jQuery <1.8
function( elem, i, match ) {
return !!$.data( elem, match[ 3 ] );
}
data: $.expr.createPseudo( function( dataName ) {
return function( elem ) {
return !!$.data( elem, dataName );
};
} )
} );
} );
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/disable-selection.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Disable Selection 1.13.3
* jQuery UI Disable Selection 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down
16 changes: 3 additions & 13 deletions vendor/assets/javascripts/jquery-ui/focusable.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Focusable 1.13.3
* jQuery UI Focusable 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down Expand Up @@ -64,20 +64,10 @@ $.ui.focusable = function( element, hasTabindex ) {
focusableIfVisible = hasTabindex;
}

return focusableIfVisible && $( element ).is( ":visible" ) && visible( $( element ) );
return focusableIfVisible && $( element ).is( ":visible" ) &&
$( element ).css( "visibility" ) === "visible";
};

// Support: IE 8 only
// IE 8 doesn't resolve inherit to visible/hidden for computed values
function visible( element ) {
var visibility = element.css( "visibility" );
while ( visibility === "inherit" ) {
element = element.parent();
visibility = element.css( "visibility" );
}
return visibility === "visible";
}

$.extend( $.expr.pseudos, {
focusable: function( element ) {
return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
Expand Down
6 changes: 2 additions & 4 deletions vendor/assets/javascripts/jquery-ui/form-reset-mixin.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
//= require jquery-ui/form
//= require jquery-ui/version

/*!
* jQuery UI Form Reset Mixin 1.13.3
* jQuery UI Form Reset Mixin 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand All @@ -23,7 +22,6 @@
// AMD. Register as an anonymous module.
define( [
"jquery",
"./form",
"./version"
], factory );
} else {
Expand All @@ -48,7 +46,7 @@ return $.ui.formResetMixin = {
},

_bindFormResetHandler: function() {
this.form = this.element._form();
this.form = $( this.element.prop( "form" ) );
if ( !this.form.length ) {
return;
}
Expand Down
25 changes: 0 additions & 25 deletions vendor/assets/javascripts/jquery-ui/form.js

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/assets/javascripts/jquery-ui/ie.js

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/keycode.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Keycode 1.13.3
* jQuery UI Keycode 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down
9 changes: 4 additions & 5 deletions vendor/assets/javascripts/jquery-ui/labels.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Labels 1.13.3
* jQuery UI Labels 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down Expand Up @@ -41,9 +41,8 @@ return $.fn.labels = function() {
return this.pushStack( this[ 0 ].labels );
}

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/position.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Position 1.13.3
* jQuery UI Position 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down
46 changes: 0 additions & 46 deletions vendor/assets/javascripts/jquery-ui/safe-active-element.js

This file was deleted.

27 changes: 0 additions & 27 deletions vendor/assets/javascripts/jquery-ui/safe-blur.js

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/scroll-parent.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Scroll Parent 1.13.3
* jQuery UI Scroll Parent 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/tabbable.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//= require jquery-ui/focusable

/*!
* jQuery UI Tabbable 1.13.3
* jQuery UI Tabbable 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/unique-id.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Unique ID 1.13.3
* jQuery UI Unique ID 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down
2 changes: 1 addition & 1 deletion vendor/assets/javascripts/jquery-ui/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

$.ui = $.ui || {};

return $.ui.version = "1.13.3";
return $.ui.version = "1.14.1";

} );
5 changes: 4 additions & 1 deletion vendor/assets/javascripts/jquery-ui/widget.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//= require jquery-ui/version

/*!
* jQuery UI Widget 1.13.3
* jQuery UI Widget 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down Expand Up @@ -58,6 +58,9 @@ $.widget = function( name, base, prototype ) {

var namespace = name.split( "." )[ 0 ];
name = name.split( "." )[ 1 ];
if ( name === "__proto__" || name === "constructor" ) {
return $.error( "Invalid widget name: " + name );
}
var fullName = namespace + "-" + name;

if ( !prototype ) {
Expand Down
12 changes: 6 additions & 6 deletions vendor/assets/javascripts/jquery-ui/widgets/button.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//= require jquery-ui/widget

/*!
* jQuery UI Button 1.13.3
* jQuery UI Button 1.14.1
* https://jqueryui.com
*
* Copyright OpenJS Foundation and other contributors
Expand Down Expand Up @@ -47,7 +47,7 @@
"use strict";

$.widget( "ui.button", {
version: "1.13.3",
version: "1.14.1",
defaultElement: "<button>",
options: {
classes: {
Expand Down Expand Up @@ -114,9 +114,9 @@ $.widget( "ui.button", {
if ( event.keyCode === $.ui.keyCode.SPACE ) {
event.preventDefault();

// Support: PhantomJS <= 1.9, IE 8 Only
// If a native click is available use it so we actually cause navigation
// otherwise just trigger a click event
// If a native click is available use it, so we
// actually cause navigation. Otherwise, just trigger
// a click event.
if ( this.element[ 0 ].click ) {
this.element[ 0 ].click();
} else {
Expand Down Expand Up @@ -292,7 +292,7 @@ $.widget( "ui.button", {
} );

// DEPRECATED
if ( $.uiBackCompat !== false ) {
if ( $.uiBackCompat === true ) {

// Text and Icons options
$.widget( "ui.button", $.ui.button, {
Expand Down
Loading
Loading