Skip to content

Commit f3943fe

Browse files
rosenfeldjoliss
rosenfeld
authored and
joliss
committed
v5.0.5: upgrade to jQuery UI 1.11.4
1 parent 45b53c1 commit f3943fe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+185
-175
lines changed

‎VERSIONS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
| Gem | jQuery UI |
44
|--------|-----------|
5+
| 5.0.5 | 1.11.4 |
56
| 5.0.4 | 1.11.3 |
67
| 5.0.3 | 1.11.2 |
78
| 5.0.2 | 1.11.2 |

‎app/assets/javascripts/jquery-ui/accordion.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//= require jquery-ui/widget
33

44
/*!
5-
* jQuery UI Accordion 1.11.3
5+
* jQuery UI Accordion 1.11.4
66
* http://jqueryui.com
77
*
88
* Copyright jQuery Foundation and other contributors
@@ -28,7 +28,7 @@
2828
}(function( $ ) {
2929

3030
return $.widget( "ui.accordion", {
31-
version: "1.11.3",
31+
version: "1.11.4",
3232
options: {
3333
active: 0,
3434
animate: {},
@@ -519,6 +519,7 @@ return $.widget( "ui.accordion", {
519519
var total, easing, duration,
520520
that = this,
521521
adjust = 0,
522+
boxSizing = toShow.css( "box-sizing" ),
522523
down = toShow.length &&
523524
( !toHide.length || ( toShow.index() < toHide.index() ) ),
524525
animate = this.options.animate || {},
@@ -561,7 +562,9 @@ return $.widget( "ui.accordion", {
561562
step: function( now, fx ) {
562563
fx.now = Math.round( now );
563564
if ( fx.prop !== "height" ) {
564-
adjust += fx.now;
565+
if ( boxSizing === "content-box" ) {
566+
adjust += fx.now;
567+
}
565568
} else if ( that.options.heightStyle !== "content" ) {
566569
fx.now = Math.round( total - toHide.outerHeight() - adjust );
567570
adjust = 0;

‎app/assets/javascripts/jquery-ui/autocomplete.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//= require jquery-ui/position
55

66
/*!
7-
* jQuery UI Autocomplete 1.11.3
7+
* jQuery UI Autocomplete 1.11.4
88
* http://jqueryui.com
99
*
1010
* Copyright jQuery Foundation and other contributors
@@ -32,7 +32,7 @@
3232
}(function( $ ) {
3333

3434
$.widget( "ui.autocomplete", {
35-
version: "1.11.3",
35+
version: "1.11.4",
3636
defaultElement: "<input>",
3737
options: {
3838
appendTo: null,

‎app/assets/javascripts/jquery-ui/button.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//= require jquery-ui/widget
33

44
/*!
5-
* jQuery UI Button 1.11.3
5+
* jQuery UI Button 1.11.4
66
* http://jqueryui.com
77
*
88
* Copyright jQuery Foundation and other contributors
@@ -55,7 +55,7 @@ var lastActive,
5555
};
5656

5757
$.widget( "ui.button", {
58-
version: "1.11.3",
58+
version: "1.11.4",
5959
defaultElement: "<button>",
6060
options: {
6161
disabled: null,
@@ -351,7 +351,7 @@ $.widget( "ui.button", {
351351
});
352352

353353
$.widget( "ui.buttonset", {
354-
version: "1.11.3",
354+
version: "1.11.4",
355355
options: {
356356
items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
357357
},

‎app/assets/javascripts/jquery-ui/core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* jQuery UI Core 1.11.3
2+
* jQuery UI Core 1.11.4
33
* http://jqueryui.com
44
*
55
* Copyright jQuery Foundation and other contributors
@@ -24,7 +24,7 @@
2424
$.ui = $.ui || {};
2525

2626
$.extend( $.ui, {
27-
version: "1.11.3",
27+
version: "1.11.4",
2828

2929
keyCode: {
3030
BACKSPACE: 8,

‎app/assets/javascripts/jquery-ui/datepicker.js

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

33
/*!
4-
* jQuery UI Datepicker 1.11.3
4+
* jQuery UI Datepicker 1.11.4
55
* http://jqueryui.com
66
*
77
* Copyright jQuery Foundation and other contributors
@@ -25,7 +25,7 @@
2525
}
2626
}(function( $ ) {
2727

28-
$.extend($.ui, { datepicker: { version: "1.11.3" } });
28+
$.extend($.ui, { datepicker: { version: "1.11.4" } });
2929

3030
var datepicker_instActive;
3131

@@ -2079,7 +2079,7 @@ $.fn.datepicker = function(options){
20792079
$.datepicker = new Datepicker(); // singleton instance
20802080
$.datepicker.initialized = false;
20812081
$.datepicker.uuid = new Date().getTime();
2082-
$.datepicker.version = "1.11.3";
2082+
$.datepicker.version = "1.11.4";
20832083

20842084
return $.datepicker;
20852085

‎app/assets/javascripts/jquery-ui/dialog.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//= require jquery-ui/resizable
77

88
/*!
9-
* jQuery UI Dialog 1.11.3
9+
* jQuery UI Dialog 1.11.4
1010
* http://jqueryui.com
1111
*
1212
* Copyright jQuery Foundation and other contributors
@@ -37,7 +37,7 @@
3737
}(function( $ ) {
3838

3939
return $.widget( "ui.dialog", {
40-
version: "1.11.3",
40+
version: "1.11.4",
4141
options: {
4242
appendTo: "body",
4343
autoOpen: true,
@@ -157,6 +157,7 @@ return $.widget( "ui.dialog", {
157157
var next,
158158
originalPosition = this.originalPosition;
159159

160+
this._untrackInstance();
160161
this._destroyOverlay();
161162

162163
this.element
@@ -235,10 +236,10 @@ return $.widget( "ui.dialog", {
235236

236237
_moveToTop: function( event, silent ) {
237238
var moved = false,
238-
zIndicies = this.uiDialog.siblings( ".ui-front:visible" ).map(function() {
239+
zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map(function() {
239240
return +$( this ).css( "z-index" );
240241
}).get(),
241-
zIndexMax = Math.max.apply( null, zIndicies );
242+
zIndexMax = Math.max.apply( null, zIndices );
242243

243244
if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) {
244245
this.uiDialog.css( "z-index", zIndexMax + 1 );

‎app/assets/javascripts/jquery-ui/draggable.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//= require jquery-ui/mouse
44

55
/*!
6-
* jQuery UI Draggable 1.11.3
6+
* jQuery UI Draggable 1.11.4
77
* http://jqueryui.com
88
*
99
* Copyright jQuery Foundation and other contributors
@@ -30,7 +30,7 @@
3030
}(function( $ ) {
3131

3232
$.widget("ui.draggable", $.ui.mouse, {
33-
version: "1.11.3",
33+
version: "1.11.4",
3434
widgetEventPrefix: "drag",
3535
options: {
3636
addClasses: true,
@@ -804,6 +804,9 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
804804
if ( !sortable.isOver ) {
805805
sortable.isOver = 1;
806806

807+
// Store draggable's parent in case we need to reappend to it later.
808+
draggable._parent = ui.helper.parent();
809+
807810
sortable.currentItem = ui.helper
808811
.appendTo( sortable.element )
809812
.data( "ui-sortable-item", true );
@@ -880,8 +883,9 @@ $.ui.plugin.add( "draggable", "connectToSortable", {
880883
sortable.placeholder.remove();
881884
}
882885

883-
// Recalculate the draggable's offset considering the sortable
884-
// may have modified them in unexpected ways (#8809)
886+
// Restore and recalculate the draggable's offset considering the sortable
887+
// may have modified them in unexpected ways. (#8809, #10669)
888+
ui.helper.appendTo( draggable._parent );
885889
draggable._refreshOffsets( event );
886890
ui.position = draggable._generatePosition( event, true );
887891

‎app/assets/javascripts/jquery-ui/droppable.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//= require jquery-ui/draggable
55

66
/*!
7-
* jQuery UI Droppable 1.11.3
7+
* jQuery UI Droppable 1.11.4
88
* http://jqueryui.com
99
*
1010
* Copyright jQuery Foundation and other contributors
@@ -32,7 +32,7 @@
3232
}(function( $ ) {
3333

3434
$.widget( "ui.droppable", {
35-
version: "1.11.3",
35+
version: "1.11.4",
3636
widgetEventPrefix: "drop",
3737
options: {
3838
accept: "*",

‎app/assets/javascripts/jquery-ui/effect-blind.js

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

33
/*!
4-
* jQuery UI Effects Blind 1.11.3
4+
* jQuery UI Effects Blind 1.11.4
55
* http://jqueryui.com
66
*
77
* Copyright jQuery Foundation and other contributors

0 commit comments

Comments
 (0)