Changeset 3178:e26b9f5d1b58 for admin/js/jquery/jquery-ui.custom.js
- Timestamp:
- 02/20/16 14:36:10 (9 years ago)
- Branch:
- default
- File:
-
- 1 edited
-
admin/js/jquery/jquery-ui.custom.js (modified) (39 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
admin/js/jquery/jquery-ui.custom.js
- Property exe deleted
r2950 r3178 1 /*! jQuery UI - v1.11. 2 - 2015-02-011 /*! jQuery UI - v1.11.4 - 2016-02-20 2 2 * http://jqueryui.com 3 3 * Includes: core.js, widget.js, mouse.js, draggable.js, sortable.js, accordion.js 4 * Copyright 2015jQuery Foundation and other contributors; Licensed MIT */4 * Copyright jQuery Foundation and other contributors; Licensed MIT */ 5 5 6 6 (function( factory ) { … … 16 16 }(function( $ ) { 17 17 /*! 18 * jQuery UI Core 1.11. 218 * jQuery UI Core 1.11.4 19 19 * http://jqueryui.com 20 20 * 21 * Copyright 2014jQuery Foundation and other contributors21 * Copyright jQuery Foundation and other contributors 22 22 * Released under the MIT license. 23 23 * http://jquery.org/license … … 31 31 32 32 $.extend( $.ui, { 33 version: "1.11. 2",33 version: "1.11.4", 34 34 35 35 keyCode: { … … 104 104 return !!img && visible( img ); 105 105 } 106 return ( / input|select|textarea|button|object/.test( nodeName ) ?106 return ( /^(input|select|textarea|button|object)$/.test( nodeName ) ? 107 107 !element.disabled : 108 108 "a" === nodeName ? … … 310 310 311 311 /*! 312 * jQuery UI Widget 1.11. 2312 * jQuery UI Widget 1.11.4 313 313 * http://jqueryui.com 314 314 * 315 * Copyright 2014jQuery Foundation and other contributors315 * Copyright jQuery Foundation and other contributors 316 316 * Released under the MIT license. 317 317 * http://jquery.org/license … … 491 491 returnValue = this; 492 492 493 // allow multiple hashes to be passed on init494 options = !isMethodCall && args.length ?495 $.widget.extend.apply( null, [ options ].concat(args) ) :496 options;497 498 493 if ( isMethodCall ) { 499 494 this.each(function() { … … 520 515 }); 521 516 } else { 517 518 // Allow multiple hashes to be passed on init 519 if ( args.length ) { 520 options = $.widget.extend.apply( null, [ options ].concat(args) ); 521 } 522 522 523 this.each(function() { 523 524 var instance = $.data( this, fullName ); … … 857 858 858 859 /*! 859 * jQuery UI Mouse 1.11. 2860 * jQuery UI Mouse 1.11.4 860 861 * http://jqueryui.com 861 862 * 862 * Copyright 2014jQuery Foundation and other contributors863 * Copyright jQuery Foundation and other contributors 863 864 * Released under the MIT license. 864 865 * http://jquery.org/license … … 874 875 875 876 var mouse = $.widget("ui.mouse", { 876 version: "1.11. 2",877 version: "1.11.4", 877 878 options: { 878 879 cancel: "input,textarea,button,select,option", … … 1043 1044 1044 1045 /*! 1045 * jQuery UI Draggable 1.11. 21046 * jQuery UI Draggable 1.11.4 1046 1047 * http://jqueryui.com 1047 1048 * 1048 * Copyright 2014jQuery Foundation and other contributors1049 * Copyright jQuery Foundation and other contributors 1049 1050 * Released under the MIT license. 1050 1051 * http://jquery.org/license … … 1055 1056 1056 1057 $.widget("ui.draggable", $.ui.mouse, { 1057 version: "1.11. 2",1058 version: "1.11.4", 1058 1059 widgetEventPrefix: "drag", 1059 1060 options: { … … 1829 1830 sortable.isOver = 1; 1830 1831 1832 // Store draggable's parent in case we need to reappend to it later. 1833 draggable._parent = ui.helper.parent(); 1834 1831 1835 sortable.currentItem = ui.helper 1832 1836 .appendTo( sortable.element ) … … 1905 1909 } 1906 1910 1907 // Recalculate the draggable's offset considering the sortable 1908 // may have modified them in unexpected ways (#8809) 1911 // Restore and recalculate the draggable's offset considering the sortable 1912 // may have modified them in unexpected ways. (#8809, #10669) 1913 ui.helper.appendTo( draggable._parent ); 1909 1914 draggable._refreshOffsets( event ); 1910 1915 ui.position = draggable._generatePosition( event, true ); … … 2156 2161 2157 2162 /*! 2158 * jQuery UI Sortable 1.11. 22163 * jQuery UI Sortable 1.11.4 2159 2164 * http://jqueryui.com 2160 2165 * 2161 * Copyright 2014jQuery Foundation and other contributors2166 * Copyright jQuery Foundation and other contributors 2162 2167 * Released under the MIT license. 2163 2168 * http://jquery.org/license … … 2168 2173 2169 2174 var sortable = $.widget("ui.sortable", $.ui.mouse, { 2170 version: "1.11. 2",2175 version: "1.11.4", 2171 2176 widgetEventPrefix: "sort", 2172 2177 ready: false, … … 2219 2224 2220 2225 _create: function() { 2221 2222 var o = this.options;2223 2226 this.containerCache = {}; 2224 2227 this.element.addClass("ui-sortable"); … … 2226 2229 //Get the items 2227 2230 this.refresh(); 2228 2229 //Let's determine if the items are being displayed horizontally2230 this.floating = this.items.length ? o.axis === "x" || this._isFloating(this.items[0].item) : false;2231 2231 2232 2232 //Let's determine the parent's offset … … 2418 2418 2419 2419 //Prepare scrolling 2420 if(this.scrollParent[0] !== document&& this.scrollParent[0].tagName !== "HTML") {2420 if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") { 2421 2421 this.overflowOffset = this.scrollParent.offset(); 2422 2422 } … … 2470 2470 //Do scrolling 2471 2471 if(this.options.scroll) { 2472 if(this.scrollParent[0] !== document&& this.scrollParent[0].tagName !== "HTML") {2472 if(this.scrollParent[0] !== this.document[0] && this.scrollParent[0].tagName !== "HTML") { 2473 2473 2474 2474 if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) { … … 2486 2486 } else { 2487 2487 2488 if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {2489 scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);2490 } else if( $(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {2491 scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);2492 } 2493 2494 if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {2495 scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);2496 } else if( $(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {2497 scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);2488 if(event.pageY - this.document.scrollTop() < o.scrollSensitivity) { 2489 scrolled = this.document.scrollTop(this.document.scrollTop() - o.scrollSpeed); 2490 } else if(this.window.height() - (event.pageY - this.document.scrollTop()) < o.scrollSensitivity) { 2491 scrolled = this.document.scrollTop(this.document.scrollTop() + o.scrollSpeed); 2492 } 2493 2494 if(event.pageX - this.document.scrollLeft() < o.scrollSensitivity) { 2495 scrolled = this.document.scrollLeft(this.document.scrollLeft() - o.scrollSpeed); 2496 } else if(this.window.width() - (event.pageX - this.document.scrollLeft()) < o.scrollSensitivity) { 2497 scrolled = this.document.scrollLeft(this.document.scrollLeft() + o.scrollSpeed); 2498 2498 } 2499 2499 … … 2594 2594 2595 2595 if ( !axis || axis === "x" ) { 2596 animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft);2596 animation.left = cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollLeft); 2597 2597 } 2598 2598 if ( !axis || axis === "y" ) { 2599 animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop);2599 animation.top = cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === this.document[0].body ? 0 : this.offsetParent[0].scrollTop); 2600 2600 } 2601 2601 this.reverting = true; … … 2790 2790 if(connectWith && connected) { 2791 2791 for (i = connectWith.length - 1; i >= 0; i--){ 2792 cur = $(connectWith[i] );2792 cur = $(connectWith[i], this.document[0]); 2793 2793 for ( j = cur.length - 1; j >= 0; j--){ 2794 2794 inst = $.data(cur[j], this.widgetFullName); … … 2840 2840 if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down 2841 2841 for (i = connectWith.length - 1; i >= 0; i--){ 2842 cur = $(connectWith[i] );2842 cur = $(connectWith[i], this.document[0]); 2843 2843 for (j = cur.length - 1; j >= 0; j--){ 2844 2844 inst = $.data(cur[j], this.widgetFullName); … … 2872 2872 2873 2873 refreshPositions: function(fast) { 2874 2875 // Determine whether items are being displayed horizontally 2876 this.floating = this.items.length ? 2877 this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) : 2878 false; 2874 2879 2875 2880 //This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change … … 2930 2935 .removeClass("ui-sortable-helper"); 2931 2936 2932 if ( nodeName === "tr" ) { 2933 that.currentItem.children().each(function() { 2934 $( "<td> </td>", that.document[0] ) 2935 .attr( "colspan", $( this ).attr( "colspan" ) || 1 ) 2936 .appendTo( element ); 2937 }); 2937 if ( nodeName === "tbody" ) { 2938 that._createTrPlaceholder( 2939 that.currentItem.find( "tr" ).eq( 0 ), 2940 $( "<tr>", that.document[ 0 ] ).appendTo( element ) 2941 ); 2942 } else if ( nodeName === "tr" ) { 2943 that._createTrPlaceholder( that.currentItem, element ); 2938 2944 } else if ( nodeName === "img" ) { 2939 2945 element.attr( "src", that.currentItem.attr( "src" ) ); … … 2970 2976 o.placeholder.update(that, that.placeholder); 2971 2977 2978 }, 2979 2980 _createTrPlaceholder: function( sourceTr, targetTr ) { 2981 var that = this; 2982 2983 sourceTr.children().each(function() { 2984 $( "<td> </td>", that.document[ 0 ] ) 2985 .attr( "colspan", $( this ).attr( "colspan" ) || 1 ) 2986 .appendTo( targetTr ); 2987 }); 2972 2988 }, 2973 2989 … … 3132 3148 // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that 3133 3149 // the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag 3134 if(this.cssPosition === "absolute" && this.scrollParent[0] !== document&& $.contains(this.scrollParent[0], this.offsetParent[0])) {3150 if(this.cssPosition === "absolute" && this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) { 3135 3151 po.left += this.scrollParent.scrollLeft(); 3136 3152 po.top += this.scrollParent.scrollTop(); … … 3139 3155 // This needs to be actually done for all browsers, since pageX/pageY includes this information 3140 3156 // with an ugly IE fix 3141 if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {3157 if( this.offsetParent[0] === this.document[0].body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) { 3142 3158 po = { top: 0, left: 0 }; 3143 3159 } … … 3189 3205 0 - this.offset.relative.left - this.offset.parent.left, 3190 3206 0 - this.offset.relative.top - this.offset.parent.top, 3191 $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,3192 ( $(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top3207 o.containment === "document" ? this.document.width() : this.window.width() - this.helperProportions.width - this.margins.left, 3208 (o.containment === "document" ? this.document.width() : this.window.height() || this.document[0].body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top 3193 3209 ]; 3194 3210 } … … 3215 3231 } 3216 3232 var mod = d === "absolute" ? 1 : -1, 3217 scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document&& $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,3233 scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, 3218 3234 scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); 3219 3235 … … 3241 3257 pageX = event.pageX, 3242 3258 pageY = event.pageY, 3243 scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document&& $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);3259 scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== this.document[0] && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName); 3244 3260 3245 3261 // This is another very weird special case that only happens for relative elements: … … 3247 3263 // 2. and the scroll parent is the document or similar to the offset parent 3248 3264 // we have to refresh the relative offset during the scroll so there are no jumps 3249 if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document&& this.scrollParent[0] !== this.offsetParent[0])) {3265 if(this.cssPosition === "relative" && !(this.scrollParent[0] !== this.document[0] && this.scrollParent[0] !== this.offsetParent[0])) { 3250 3266 this.offset.relative = this._getRelativeOffset(); 3251 3267 } … … 3445 3461 3446 3462 /*! 3447 * jQuery UI Accordion 1.11. 23463 * jQuery UI Accordion 1.11.4 3448 3464 * http://jqueryui.com 3449 3465 * 3450 * Copyright 2014jQuery Foundation and other contributors3466 * Copyright jQuery Foundation and other contributors 3451 3467 * Released under the MIT license. 3452 3468 * http://jquery.org/license … … 3457 3473 3458 3474 var accordion = $.widget( "ui.accordion", { 3459 version: "1.11. 2",3475 version: "1.11.4", 3460 3476 options: { 3461 3477 active: 0, … … 3915 3931 "aria-hidden": "true" 3916 3932 }); 3917 toHide.prev().attr( "aria-selected", "false" ); 3933 toHide.prev().attr({ 3934 "aria-selected": "false", 3935 "aria-expanded": "false" 3936 }); 3918 3937 // if we're switching panels, remove the old header from the tab order 3919 3938 // if we're opening from collapsed state, remove the previous header from the tab order … … 3926 3945 } else if ( toShow.length ) { 3927 3946 this.headers.filter(function() { 3928 return $( this ).attr( "tabIndex") === 0;3947 return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0; 3929 3948 }) 3930 3949 .attr( "tabIndex", -1 ); … … 3936 3955 .attr({ 3937 3956 "aria-selected": "true", 3938 tabIndex: 0,3939 "aria-expanded": "true"3957 "aria-expanded": "true", 3958 tabIndex: 0 3940 3959 }); 3941 3960 }, … … 3945 3964 that = this, 3946 3965 adjust = 0, 3966 boxSizing = toShow.css( "box-sizing" ), 3947 3967 down = toShow.length && 3948 3968 ( !toHide.length || ( toShow.index() < toHide.index() ) ), … … 3987 4007 fx.now = Math.round( now ); 3988 4008 if ( fx.prop !== "height" ) { 3989 adjust += fx.now; 4009 if ( boxSizing === "content-box" ) { 4010 adjust += fx.now; 4011 } 3990 4012 } else if ( that.options.heightStyle !== "content" ) { 3991 4013 fx.now = Math.round( total - toHide.outerHeight() - adjust );
Note: See TracChangeset
for help on using the changeset viewer.