jquery-ui-rails 4.1.2 → 4.2.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of jquery-ui-rails might be problematic. Click here for more details.
- data/History.md +9 -0
- data/README.md +1 -1
- data/Rakefile +9 -0
- data/VERSIONS.md +3 -1
- data/app/assets/javascripts/jquery.ui.accordion.js +13 -15
- data/app/assets/javascripts/jquery.ui.autocomplete.js +12 -16
- data/app/assets/javascripts/jquery.ui.button.js +21 -45
- data/app/assets/javascripts/jquery.ui.core.js +3 -3
- data/app/assets/javascripts/jquery.ui.datepicker-es.js +7 -7
- data/app/assets/javascripts/jquery.ui.datepicker-fi.js +1 -1
- data/app/assets/javascripts/jquery.ui.datepicker-fr-CH.js +7 -7
- data/app/assets/javascripts/jquery.ui.datepicker-fr.js +6 -6
- data/app/assets/javascripts/jquery.ui.datepicker-is.js +1 -1
- data/app/assets/javascripts/jquery.ui.datepicker-lt.js +2 -2
- data/app/assets/javascripts/jquery.ui.datepicker-lv.js +4 -4
- data/app/assets/javascripts/jquery.ui.datepicker-pt.js +1 -1
- data/app/assets/javascripts/jquery.ui.datepicker.js +4 -4
- data/app/assets/javascripts/jquery.ui.dialog.js +25 -10
- data/app/assets/javascripts/jquery.ui.draggable.js +3 -3
- data/app/assets/javascripts/jquery.ui.droppable.js +31 -14
- data/app/assets/javascripts/jquery.ui.effect-blind.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-bounce.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-clip.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-drop.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-explode.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-fade.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-fold.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-highlight.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-pulsate.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-scale.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-shake.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-slide.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect-transfer.js +2 -2
- data/app/assets/javascripts/jquery.ui.effect.js +3 -3
- data/app/assets/javascripts/jquery.ui.menu.js +14 -8
- data/app/assets/javascripts/jquery.ui.mouse.js +3 -3
- data/app/assets/javascripts/jquery.ui.position.js +11 -7
- data/app/assets/javascripts/jquery.ui.progressbar.js +3 -3
- data/app/assets/javascripts/jquery.ui.resizable.js +20 -10
- data/app/assets/javascripts/jquery.ui.selectable.js +3 -3
- data/app/assets/javascripts/jquery.ui.slider.js +11 -7
- data/app/assets/javascripts/jquery.ui.sortable.js +18 -14
- data/app/assets/javascripts/jquery.ui.spinner.js +9 -5
- data/app/assets/javascripts/jquery.ui.tabs.js +8 -5
- data/app/assets/javascripts/jquery.ui.tooltip.js +3 -3
- data/app/assets/javascripts/jquery.ui.widget.js +5 -5
- data/app/assets/stylesheets/jquery.ui.accordion.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.all.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.autocomplete.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.base.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.button.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.core.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.datepicker.css.erb +3 -6
- data/app/assets/stylesheets/jquery.ui.dialog.css.erb +5 -4
- data/app/assets/stylesheets/jquery.ui.menu.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.progressbar.css.erb +8 -3
- data/app/assets/stylesheets/jquery.ui.resizable.css.erb +2 -4
- data/app/assets/stylesheets/jquery.ui.selectable.css.erb +2 -4
- data/app/assets/stylesheets/jquery.ui.slider.css.erb +3 -3
- data/app/assets/stylesheets/jquery.ui.spinner.css.erb +5 -5
- data/app/assets/stylesheets/jquery.ui.tabs.css.erb +8 -9
- data/app/assets/stylesheets/jquery.ui.theme.css.erb +25 -4
- data/app/assets/stylesheets/jquery.ui.tooltip.css.erb +4 -2
- data/lib/jquery/ui/rails/version.rb +2 -2
- metadata +5 -5
@@ -3,10 +3,10 @@
|
|
3
3
|
//= require jquery.ui.mouse
|
4
4
|
|
5
5
|
/*!
|
6
|
-
* jQuery UI Draggable 1.10.
|
6
|
+
* jQuery UI Draggable 1.10.4
|
7
7
|
* http://jqueryui.com
|
8
8
|
*
|
9
|
-
* Copyright
|
9
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
10
10
|
* Released under the MIT license.
|
11
11
|
* http://jquery.org/license
|
12
12
|
*
|
@@ -20,7 +20,7 @@
|
|
20
20
|
(function( $, undefined ) {
|
21
21
|
|
22
22
|
$.widget("ui.draggable", $.ui.mouse, {
|
23
|
-
version: "1.10.
|
23
|
+
version: "1.10.4",
|
24
24
|
widgetEventPrefix: "drag",
|
25
25
|
options: {
|
26
26
|
addClasses: true,
|
@@ -4,10 +4,10 @@
|
|
4
4
|
//= require jquery.ui.draggable
|
5
5
|
|
6
6
|
/*!
|
7
|
-
* jQuery UI Droppable 1.10.
|
7
|
+
* jQuery UI Droppable 1.10.4
|
8
8
|
* http://jqueryui.com
|
9
9
|
*
|
10
|
-
* Copyright
|
10
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
11
11
|
* Released under the MIT license.
|
12
12
|
* http://jquery.org/license
|
13
13
|
*
|
@@ -26,7 +26,7 @@ function isOverAxis( x, reference, size ) {
|
|
26
26
|
}
|
27
27
|
|
28
28
|
$.widget("ui.droppable", {
|
29
|
-
version: "1.10.
|
29
|
+
version: "1.10.4",
|
30
30
|
widgetEventPrefix: "drop",
|
31
31
|
options: {
|
32
32
|
accept: "*",
|
@@ -46,7 +46,8 @@ $.widget("ui.droppable", {
|
|
46
46
|
},
|
47
47
|
_create: function() {
|
48
48
|
|
49
|
-
var
|
49
|
+
var proportions,
|
50
|
+
o = this.options,
|
50
51
|
accept = o.accept;
|
51
52
|
|
52
53
|
this.isover = false;
|
@@ -56,8 +57,20 @@ $.widget("ui.droppable", {
|
|
56
57
|
return d.is(accept);
|
57
58
|
};
|
58
59
|
|
59
|
-
|
60
|
-
|
60
|
+
this.proportions = function( /* valueToWrite */ ) {
|
61
|
+
if ( arguments.length ) {
|
62
|
+
// Store the droppable's proportions
|
63
|
+
proportions = arguments[ 0 ];
|
64
|
+
} else {
|
65
|
+
// Retrieve or derive the droppable's proportions
|
66
|
+
return proportions ?
|
67
|
+
proportions :
|
68
|
+
proportions = {
|
69
|
+
width: this.element[ 0 ].offsetWidth,
|
70
|
+
height: this.element[ 0 ].offsetHeight
|
71
|
+
};
|
72
|
+
}
|
73
|
+
};
|
61
74
|
|
62
75
|
// Add the reference and positions to the manager
|
63
76
|
$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
|
@@ -203,10 +216,14 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
|
|
203
216
|
}
|
204
217
|
|
205
218
|
var draggableLeft, draggableTop,
|
206
|
-
x1 = (draggable.positionAbs || draggable.position.absolute).left,
|
207
|
-
y1 = (draggable.positionAbs || draggable.position.absolute).top,
|
208
|
-
|
209
|
-
|
219
|
+
x1 = (draggable.positionAbs || draggable.position.absolute).left,
|
220
|
+
y1 = (draggable.positionAbs || draggable.position.absolute).top,
|
221
|
+
x2 = x1 + draggable.helperProportions.width,
|
222
|
+
y2 = y1 + draggable.helperProportions.height,
|
223
|
+
l = droppable.offset.left,
|
224
|
+
t = droppable.offset.top,
|
225
|
+
r = l + droppable.proportions().width,
|
226
|
+
b = t + droppable.proportions().height;
|
210
227
|
|
211
228
|
switch (toleranceMode) {
|
212
229
|
case "fit":
|
@@ -219,7 +236,7 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
|
|
219
236
|
case "pointer":
|
220
237
|
draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left);
|
221
238
|
draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top);
|
222
|
-
return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
|
239
|
+
return isOverAxis( draggableTop, t, droppable.proportions().height ) && isOverAxis( draggableLeft, l, droppable.proportions().width );
|
223
240
|
case "touch":
|
224
241
|
return (
|
225
242
|
(y1 >= t && y1 <= b) || // Top edge touching
|
@@ -259,7 +276,7 @@ $.ui.ddmanager = {
|
|
259
276
|
// Filter out elements in the current dragged item
|
260
277
|
for (j=0; j < list.length; j++) {
|
261
278
|
if(list[j] === m[i].element[0]) {
|
262
|
-
m[i].proportions.height = 0;
|
279
|
+
m[i].proportions().height = 0;
|
263
280
|
continue droppablesLoop;
|
264
281
|
}
|
265
282
|
}
|
@@ -274,8 +291,8 @@ $.ui.ddmanager = {
|
|
274
291
|
m[i]._activate.call(m[i], event);
|
275
292
|
}
|
276
293
|
|
277
|
-
m[i].offset = m[i].element.offset();
|
278
|
-
m[i].proportions
|
294
|
+
m[ i ].offset = m[ i ].element.offset();
|
295
|
+
m[ i ].proportions({ width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight });
|
279
296
|
|
280
297
|
}
|
281
298
|
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Blind 1.10.
|
4
|
+
* jQuery UI Effects Blind 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Bounce 1.10.
|
4
|
+
* jQuery UI Effects Bounce 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Clip 1.10.
|
4
|
+
* jQuery UI Effects Clip 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Drop 1.10.
|
4
|
+
* jQuery UI Effects Drop 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Explode 1.10.
|
4
|
+
* jQuery UI Effects Explode 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Fade 1.10.
|
4
|
+
* jQuery UI Effects Fade 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Fold 1.10.
|
4
|
+
* jQuery UI Effects Fold 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Highlight 1.10.
|
4
|
+
* jQuery UI Effects Highlight 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Pulsate 1.10.
|
4
|
+
* jQuery UI Effects Pulsate 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Scale 1.10.
|
4
|
+
* jQuery UI Effects Scale 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Shake 1.10.
|
4
|
+
* jQuery UI Effects Shake 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Slide 1.10.
|
4
|
+
* jQuery UI Effects Slide 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,10 +1,10 @@
|
|
1
1
|
//= require jquery.ui.effect
|
2
2
|
|
3
3
|
/*!
|
4
|
-
* jQuery UI Effects Transfer 1.10.
|
4
|
+
* jQuery UI Effects Transfer 1.10.4
|
5
5
|
* http://jqueryui.com
|
6
6
|
*
|
7
|
-
* Copyright
|
7
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
8
8
|
* Released under the MIT license.
|
9
9
|
* http://jquery.org/license
|
10
10
|
*
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/*!
|
2
|
-
* jQuery UI Effects 1.10.
|
2
|
+
* jQuery UI Effects 1.10.4
|
3
3
|
* http://jqueryui.com
|
4
4
|
*
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
6
6
|
* Released under the MIT license.
|
7
7
|
* http://jquery.org/license
|
8
8
|
*
|
@@ -893,7 +893,7 @@ $.fn.extend({
|
|
893
893
|
(function() {
|
894
894
|
|
895
895
|
$.extend( $.effects, {
|
896
|
-
version: "1.10.
|
896
|
+
version: "1.10.4",
|
897
897
|
|
898
898
|
// Saves a set of properties in a data storage
|
899
899
|
save: function( element, set ) {
|
@@ -3,10 +3,10 @@
|
|
3
3
|
//= require jquery.ui.position
|
4
4
|
|
5
5
|
/*!
|
6
|
-
* jQuery UI Menu 1.10.
|
6
|
+
* jQuery UI Menu 1.10.4
|
7
7
|
* http://jqueryui.com
|
8
8
|
*
|
9
|
-
* Copyright
|
9
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
10
10
|
* Released under the MIT license.
|
11
11
|
* http://jquery.org/license
|
12
12
|
*
|
@@ -20,7 +20,7 @@
|
|
20
20
|
(function( $, undefined ) {
|
21
21
|
|
22
22
|
$.widget( "ui.menu", {
|
23
|
-
version: "1.10.
|
23
|
+
version: "1.10.4",
|
24
24
|
defaultElement: "<ul>",
|
25
25
|
delay: 300,
|
26
26
|
options: {
|
@@ -79,13 +79,18 @@ $.widget( "ui.menu", {
|
|
79
79
|
"click .ui-menu-item:has(a)": function( event ) {
|
80
80
|
var target = $( event.target ).closest( ".ui-menu-item" );
|
81
81
|
if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
|
82
|
-
this.mouseHandled = true;
|
83
|
-
|
84
82
|
this.select( event );
|
83
|
+
|
84
|
+
// Only set the mouseHandled flag if the event will bubble, see #9469.
|
85
|
+
if ( !event.isPropagationStopped() ) {
|
86
|
+
this.mouseHandled = true;
|
87
|
+
}
|
88
|
+
|
85
89
|
// Open submenu on click
|
86
90
|
if ( target.has( ".ui-menu" ).length ) {
|
87
91
|
this.expand( event );
|
88
|
-
} else if ( !this.element.is( ":focus" ) ) {
|
92
|
+
} else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
|
93
|
+
|
89
94
|
// Redirect focus to the menu
|
90
95
|
this.element.trigger( "focus", [ true ] );
|
91
96
|
|
@@ -178,7 +183,6 @@ $.widget( "ui.menu", {
|
|
178
183
|
},
|
179
184
|
|
180
185
|
_keydown: function( event ) {
|
181
|
-
/*jshint maxcomplexity:20*/
|
182
186
|
var match, prev, character, skip, regex,
|
183
187
|
preventDefault = true;
|
184
188
|
|
@@ -287,6 +291,8 @@ $.widget( "ui.menu", {
|
|
287
291
|
icon = this.options.icons.submenu,
|
288
292
|
submenus = this.element.find( this.options.menus );
|
289
293
|
|
294
|
+
this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
|
295
|
+
|
290
296
|
// Initialize nested menus
|
291
297
|
submenus.filter( ":not(.ui-menu)" )
|
292
298
|
.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
|
@@ -387,7 +393,7 @@ $.widget( "ui.menu", {
|
|
387
393
|
}
|
388
394
|
|
389
395
|
nested = item.children( ".ui-menu" );
|
390
|
-
if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
|
396
|
+
if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
|
391
397
|
this._startOpening(nested);
|
392
398
|
}
|
393
399
|
this.activeMenu = item.parent();
|
@@ -2,10 +2,10 @@
|
|
2
2
|
//= require jquery.ui.widget
|
3
3
|
|
4
4
|
/*!
|
5
|
-
* jQuery UI Mouse 1.10.
|
5
|
+
* jQuery UI Mouse 1.10.4
|
6
6
|
* http://jqueryui.com
|
7
7
|
*
|
8
|
-
* Copyright
|
8
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
9
9
|
* Released under the MIT license.
|
10
10
|
* http://jquery.org/license
|
11
11
|
*
|
@@ -22,7 +22,7 @@ $( document ).mouseup( function() {
|
|
22
22
|
});
|
23
23
|
|
24
24
|
$.widget("ui.mouse", {
|
25
|
-
version: "1.10.
|
25
|
+
version: "1.10.4",
|
26
26
|
options: {
|
27
27
|
cancel: "input,textarea,button,select,option",
|
28
28
|
distance: 1,
|
@@ -1,8 +1,8 @@
|
|
1
1
|
/*!
|
2
|
-
* jQuery UI Position 1.10.
|
2
|
+
* jQuery UI Position 1.10.4
|
3
3
|
* http://jqueryui.com
|
4
4
|
*
|
5
|
-
* Copyright
|
5
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
6
6
|
* Released under the MIT license.
|
7
7
|
* http://jquery.org/license
|
8
8
|
*
|
@@ -70,7 +70,7 @@ $.position = {
|
|
70
70
|
return cachedScrollbarWidth;
|
71
71
|
}
|
72
72
|
var w1, w2,
|
73
|
-
div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
|
73
|
+
div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
|
74
74
|
innerDiv = div.children()[0];
|
75
75
|
|
76
76
|
$( "body" ).append( div );
|
@@ -88,8 +88,10 @@ $.position = {
|
|
88
88
|
return (cachedScrollbarWidth = w1 - w2);
|
89
89
|
},
|
90
90
|
getScrollInfo: function( within ) {
|
91
|
-
var overflowX = within.isWindow
|
92
|
-
|
91
|
+
var overflowX = within.isWindow || within.isDocument ? "" :
|
92
|
+
within.element.css( "overflow-x" ),
|
93
|
+
overflowY = within.isWindow || within.isDocument ? "" :
|
94
|
+
within.element.css( "overflow-y" ),
|
93
95
|
hasOverflowX = overflowX === "scroll" ||
|
94
96
|
( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
|
95
97
|
hasOverflowY = overflowY === "scroll" ||
|
@@ -101,10 +103,12 @@ $.position = {
|
|
101
103
|
},
|
102
104
|
getWithinInfo: function( element ) {
|
103
105
|
var withinElement = $( element || window ),
|
104
|
-
isWindow = $.isWindow( withinElement[0] )
|
106
|
+
isWindow = $.isWindow( withinElement[0] ),
|
107
|
+
isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
|
105
108
|
return {
|
106
109
|
element: withinElement,
|
107
110
|
isWindow: isWindow,
|
111
|
+
isDocument: isDocument,
|
108
112
|
offset: withinElement.offset() || { left: 0, top: 0 },
|
109
113
|
scrollLeft: withinElement.scrollLeft(),
|
110
114
|
scrollTop: withinElement.scrollTop(),
|
@@ -436,7 +440,7 @@ $.ui.position = {
|
|
436
440
|
}
|
437
441
|
}
|
438
442
|
else if ( overBottom > 0 ) {
|
439
|
-
newOverTop = position.top -
|
443
|
+
newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
|
440
444
|
if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
|
441
445
|
position.top += myOffset + atOffset + offset;
|
442
446
|
}
|
@@ -2,10 +2,10 @@
|
|
2
2
|
//= require jquery.ui.widget
|
3
3
|
|
4
4
|
/*!
|
5
|
-
* jQuery UI Progressbar 1.10.
|
5
|
+
* jQuery UI Progressbar 1.10.4
|
6
6
|
* http://jqueryui.com
|
7
7
|
*
|
8
|
-
* Copyright
|
8
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
9
9
|
* Released under the MIT license.
|
10
10
|
* http://jquery.org/license
|
11
11
|
*
|
@@ -18,7 +18,7 @@
|
|
18
18
|
(function( $, undefined ) {
|
19
19
|
|
20
20
|
$.widget( "ui.progressbar", {
|
21
|
-
version: "1.10.
|
21
|
+
version: "1.10.4",
|
22
22
|
options: {
|
23
23
|
max: 100,
|
24
24
|
value: 0,
|
@@ -3,10 +3,10 @@
|
|
3
3
|
//= require jquery.ui.mouse
|
4
4
|
|
5
5
|
/*!
|
6
|
-
* jQuery UI Resizable 1.10.
|
6
|
+
* jQuery UI Resizable 1.10.4
|
7
7
|
* http://jqueryui.com
|
8
8
|
*
|
9
|
-
* Copyright
|
9
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
10
10
|
* Released under the MIT license.
|
11
11
|
* http://jquery.org/license
|
12
12
|
*
|
@@ -28,7 +28,7 @@ function isNumber(value) {
|
|
28
28
|
}
|
29
29
|
|
30
30
|
$.widget("ui.resizable", $.ui.mouse, {
|
31
|
-
version: "1.10.
|
31
|
+
version: "1.10.4",
|
32
32
|
widgetEventPrefix: "resize",
|
33
33
|
options: {
|
34
34
|
alsoResize: false,
|
@@ -297,7 +297,7 @@ $.widget("ui.resizable", $.ui.mouse, {
|
|
297
297
|
//Store needed variables
|
298
298
|
this.offset = this.helper.offset();
|
299
299
|
this.position = { left: curleft, top: curtop };
|
300
|
-
this.size = this._helper ? { width:
|
300
|
+
this.size = this._helper ? { width: this.helper.width(), height: this.helper.height() } : { width: el.width(), height: el.height() };
|
301
301
|
this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
|
302
302
|
this.originalPosition = { left: curleft, top: curtop };
|
303
303
|
this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
|
@@ -778,8 +778,8 @@ $.ui.plugin.add("resizable", "containment", {
|
|
778
778
|
isParent = that.containerElement.get(0) === that.element.parent().get(0);
|
779
779
|
isOffsetRelative = /relative|absolute/.test(that.containerElement.css("position"));
|
780
780
|
|
781
|
-
if(isParent && isOffsetRelative) {
|
782
|
-
woset -= that.parentData.left;
|
781
|
+
if ( isParent && isOffsetRelative ) {
|
782
|
+
woset -= Math.abs( that.parentData.left );
|
783
783
|
}
|
784
784
|
|
785
785
|
if (woset + that.size.width >= that.parentData.width) {
|
@@ -960,10 +960,20 @@ $.ui.plugin.add("resizable", "grid", {
|
|
960
960
|
that.size.height = newHeight;
|
961
961
|
that.position.left = op.left - ox;
|
962
962
|
} else {
|
963
|
-
|
964
|
-
|
965
|
-
|
966
|
-
|
963
|
+
if ( newHeight - gridY > 0 ) {
|
964
|
+
that.size.height = newHeight;
|
965
|
+
that.position.top = op.top - oy;
|
966
|
+
} else {
|
967
|
+
that.size.height = gridY;
|
968
|
+
that.position.top = op.top + os.height - gridY;
|
969
|
+
}
|
970
|
+
if ( newWidth - gridX > 0 ) {
|
971
|
+
that.size.width = newWidth;
|
972
|
+
that.position.left = op.left - ox;
|
973
|
+
} else {
|
974
|
+
that.size.width = gridX;
|
975
|
+
that.position.left = op.left + os.width - gridX;
|
976
|
+
}
|
967
977
|
}
|
968
978
|
}
|
969
979
|
|
@@ -3,10 +3,10 @@
|
|
3
3
|
//= require jquery.ui.mouse
|
4
4
|
|
5
5
|
/*!
|
6
|
-
* jQuery UI Selectable 1.10.
|
6
|
+
* jQuery UI Selectable 1.10.4
|
7
7
|
* http://jqueryui.com
|
8
8
|
*
|
9
|
-
* Copyright
|
9
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
10
10
|
* Released under the MIT license.
|
11
11
|
* http://jquery.org/license
|
12
12
|
*
|
@@ -20,7 +20,7 @@
|
|
20
20
|
(function( $, undefined ) {
|
21
21
|
|
22
22
|
$.widget("ui.selectable", $.ui.mouse, {
|
23
|
-
version: "1.10.
|
23
|
+
version: "1.10.4",
|
24
24
|
options: {
|
25
25
|
appendTo: "body",
|
26
26
|
autoRefresh: true,
|
@@ -3,10 +3,10 @@
|
|
3
3
|
//= require jquery.ui.mouse
|
4
4
|
|
5
5
|
/*!
|
6
|
-
* jQuery UI Slider 1.10.
|
6
|
+
* jQuery UI Slider 1.10.4
|
7
7
|
* http://jqueryui.com
|
8
8
|
*
|
9
|
-
* Copyright
|
9
|
+
* Copyright 2014 jQuery Foundation and other contributors
|
10
10
|
* Released under the MIT license.
|
11
11
|
* http://jquery.org/license
|
12
12
|
*
|
@@ -24,7 +24,7 @@
|
|
24
24
|
var numPages = 5;
|
25
25
|
|
26
26
|
$.widget( "ui.slider", $.ui.mouse, {
|
27
|
-
version: "1.10.
|
27
|
+
version: "1.10.4",
|
28
28
|
widgetEventPrefix: "slide",
|
29
29
|
|
30
30
|
options: {
|
@@ -135,7 +135,10 @@ $.widget( "ui.slider", $.ui.mouse, {
|
|
135
135
|
this.range.addClass( classes +
|
136
136
|
( ( options.range === "min" || options.range === "max" ) ? " ui-slider-range-" + options.range : "" ) );
|
137
137
|
} else {
|
138
|
-
this.range
|
138
|
+
if ( this.range ) {
|
139
|
+
this.range.remove();
|
140
|
+
}
|
141
|
+
this.range = null;
|
139
142
|
}
|
140
143
|
},
|
141
144
|
|
@@ -149,7 +152,9 @@ $.widget( "ui.slider", $.ui.mouse, {
|
|
149
152
|
|
150
153
|
_destroy: function() {
|
151
154
|
this.handles.remove();
|
152
|
-
this.range
|
155
|
+
if ( this.range ) {
|
156
|
+
this.range.remove();
|
157
|
+
}
|
153
158
|
|
154
159
|
this.element
|
155
160
|
.removeClass( "ui-slider" +
|
@@ -321,7 +326,7 @@ $.widget( "ui.slider", $.ui.mouse, {
|
|
321
326
|
} );
|
322
327
|
otherVal = this.values( index ? 0 : 1 );
|
323
328
|
if ( allowed !== false ) {
|
324
|
-
this.values( index, newVal
|
329
|
+
this.values( index, newVal );
|
325
330
|
}
|
326
331
|
}
|
327
332
|
} else {
|
@@ -593,7 +598,6 @@ $.widget( "ui.slider", $.ui.mouse, {
|
|
593
598
|
|
594
599
|
_handleEvents: {
|
595
600
|
keydown: function( event ) {
|
596
|
-
/*jshint maxcomplexity:25*/
|
597
601
|
var allowed, curVal, newVal, step,
|
598
602
|
index = $( event.target ).data( "ui-slider-handle-index" );
|
599
603
|
|