diff --git a/bower.json b/bower.json index 89bb508..9579a6f 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "jquery-ui", - "version": "1.11.3", + "version": "1.11.4", "main": [ "jquery-ui.js" ], diff --git a/component.json b/component.json index 4860aed..8e7645f 100644 --- a/component.json +++ b/component.json @@ -1,7 +1,7 @@ { "name": "jquery-ui", "repo": "components/jqueryui", - "version": "1.11.3", + "version": "1.11.4", "license": "MIT", "scripts": [ "jquery-ui.js" diff --git a/jquery-ui.js b/jquery-ui.js index b3c719c..31ee9cd 100644 --- a/jquery-ui.js +++ b/jquery-ui.js @@ -1,7 +1,7 @@ -/*! jQuery UI - v1.11.3 - 2015-02-12 +/*! jQuery UI - v1.11.4 - 2015-03-11 * http://jqueryui.com * Includes: core.js, widget.js, mouse.js, position.js, accordion.js, autocomplete.js, button.js, datepicker.js, dialog.js, draggable.js, droppable.js, effect.js, effect-blind.js, effect-bounce.js, effect-clip.js, effect-drop.js, effect-explode.js, effect-fade.js, effect-fold.js, effect-highlight.js, effect-puff.js, effect-pulsate.js, effect-scale.js, effect-shake.js, effect-size.js, effect-slide.js, effect-transfer.js, menu.js, progressbar.js, resizable.js, selectable.js, selectmenu.js, slider.js, sortable.js, spinner.js, tabs.js, tooltip.js -* Copyright jQuery Foundation and other contributors; Licensed MIT */ +* Copyright 2015 jQuery Foundation and other contributors; Licensed MIT */ (function( factory ) { if ( typeof define === "function" && define.amd ) { @@ -15,7 +15,7 @@ } }(function( $ ) { /*! - * jQuery UI Core 1.11.3 + * jQuery UI Core 1.11.4 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -30,7 +30,7 @@ $.ui = $.ui || {}; $.extend( $.ui, { - version: "1.11.3", + version: "1.11.4", keyCode: { BACKSPACE: 8, @@ -309,7 +309,7 @@ $.ui.plugin = { /*! - * jQuery UI Widget 1.11.3 + * jQuery UI Widget 1.11.4 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -857,7 +857,7 @@ var widget = $.widget; /*! - * jQuery UI Mouse 1.11.3 + * jQuery UI Mouse 1.11.4 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -874,7 +874,7 @@ $( document ).mouseup( function() { }); var mouse = $.widget("ui.mouse", { - version: "1.11.3", + version: "1.11.4", options: { cancel: "input,textarea,button,select,option", distance: 1, @@ -1043,7 +1043,7 @@ var mouse = $.widget("ui.mouse", { /*! - * jQuery UI Position 1.11.3 + * jQuery UI Position 1.11.4 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -1550,7 +1550,7 @@ var position = $.ui.position; /*! - * jQuery UI Accordion 1.11.3 + * jQuery UI Accordion 1.11.4 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -1562,7 +1562,7 @@ var position = $.ui.position; var accordion = $.widget( "ui.accordion", { - version: "1.11.3", + version: "1.11.4", options: { active: 0, animate: {}, @@ -2053,6 +2053,7 @@ var accordion = $.widget( "ui.accordion", { var total, easing, duration, that = this, adjust = 0, + boxSizing = toShow.css( "box-sizing" ), down = toShow.length && ( !toHide.length || ( toShow.index() < toHide.index() ) ), animate = this.options.animate || {}, @@ -2095,7 +2096,9 @@ var accordion = $.widget( "ui.accordion", { step: function( now, fx ) { fx.now = Math.round( now ); if ( fx.prop !== "height" ) { - adjust += fx.now; + if ( boxSizing === "content-box" ) { + adjust += fx.now; + } } else if ( that.options.heightStyle !== "content" ) { fx.now = Math.round( total - toHide.outerHeight() - adjust ); adjust = 0; @@ -2123,7 +2126,7 @@ var accordion = $.widget( "ui.accordion", { /*! - * jQuery UI Menu 1.11.3 + * jQuery UI Menu 1.11.4 * http://jqueryui.com * * Copyright jQuery Foundation and other contributors @@ -2135,7 +2138,7 @@ var accordion = $.widget( "ui.accordion", { var menu = $.widget( "ui.menu", { - version: "1.11.3", + version: "1.11.4", defaultElement: "