jquery-ui-rails 2.0.1 → 2.0.2

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.

Files changed (51) hide show
  1. data/History.md +4 -0
  2. data/lib/jquery/ui/rails/version.rb +1 -1
  3. data/vendor/assets/javascripts/jquery.effects.blind.js +1 -1
  4. data/vendor/assets/javascripts/jquery.effects.bounce.js +1 -1
  5. data/vendor/assets/javascripts/jquery.effects.clip.js +1 -1
  6. data/vendor/assets/javascripts/jquery.effects.core.js +2 -2
  7. data/vendor/assets/javascripts/jquery.effects.drop.js +1 -1
  8. data/vendor/assets/javascripts/jquery.effects.explode.js +1 -1
  9. data/vendor/assets/javascripts/jquery.effects.fade.js +1 -1
  10. data/vendor/assets/javascripts/jquery.effects.fold.js +1 -1
  11. data/vendor/assets/javascripts/jquery.effects.highlight.js +1 -1
  12. data/vendor/assets/javascripts/jquery.effects.pulsate.js +1 -1
  13. data/vendor/assets/javascripts/jquery.effects.scale.js +1 -1
  14. data/vendor/assets/javascripts/jquery.effects.shake.js +1 -1
  15. data/vendor/assets/javascripts/jquery.effects.slide.js +1 -1
  16. data/vendor/assets/javascripts/jquery.effects.transfer.js +1 -1
  17. data/vendor/assets/javascripts/jquery.ui.accordion.js +2 -2
  18. data/vendor/assets/javascripts/jquery.ui.autocomplete.js +1 -1
  19. data/vendor/assets/javascripts/jquery.ui.button.js +1 -1
  20. data/vendor/assets/javascripts/jquery.ui.core.js +2 -2
  21. data/vendor/assets/javascripts/jquery.ui.datepicker-zh-CN.js +2 -2
  22. data/vendor/assets/javascripts/jquery.ui.datepicker-zh-HK.js +2 -2
  23. data/vendor/assets/javascripts/jquery.ui.datepicker-zh-TW.js +2 -2
  24. data/vendor/assets/javascripts/jquery.ui.datepicker.js +3 -3
  25. data/vendor/assets/javascripts/jquery.ui.dialog.js +2 -2
  26. data/vendor/assets/javascripts/jquery.ui.draggable.js +6 -7
  27. data/vendor/assets/javascripts/jquery.ui.droppable.js +8 -3
  28. data/vendor/assets/javascripts/jquery.ui.mouse.js +1 -1
  29. data/vendor/assets/javascripts/jquery.ui.position.js +1 -1
  30. data/vendor/assets/javascripts/jquery.ui.progressbar.js +2 -2
  31. data/vendor/assets/javascripts/jquery.ui.resizable.js +2 -2
  32. data/vendor/assets/javascripts/jquery.ui.selectable.js +2 -2
  33. data/vendor/assets/javascripts/jquery.ui.slider.js +2 -2
  34. data/vendor/assets/javascripts/jquery.ui.sortable.js +22 -12
  35. data/vendor/assets/javascripts/jquery.ui.tabs.js +2 -2
  36. data/vendor/assets/javascripts/jquery.ui.widget.js +1 -1
  37. data/vendor/assets/stylesheets/jquery.ui.accordion.css.erb +1 -1
  38. data/vendor/assets/stylesheets/jquery.ui.all.css.erb +1 -1
  39. data/vendor/assets/stylesheets/jquery.ui.autocomplete.css.erb +2 -2
  40. data/vendor/assets/stylesheets/jquery.ui.base.css.erb +1 -1
  41. data/vendor/assets/stylesheets/jquery.ui.button.css.erb +1 -1
  42. data/vendor/assets/stylesheets/jquery.ui.core.css.erb +1 -1
  43. data/vendor/assets/stylesheets/jquery.ui.datepicker.css.erb +1 -1
  44. data/vendor/assets/stylesheets/jquery.ui.dialog.css.erb +1 -1
  45. data/vendor/assets/stylesheets/jquery.ui.progressbar.css.erb +1 -1
  46. data/vendor/assets/stylesheets/jquery.ui.resizable.css.erb +1 -1
  47. data/vendor/assets/stylesheets/jquery.ui.selectable.css.erb +1 -1
  48. data/vendor/assets/stylesheets/jquery.ui.slider.css.erb +1 -1
  49. data/vendor/assets/stylesheets/jquery.ui.tabs.css.erb +1 -1
  50. data/vendor/assets/stylesheets/jquery.ui.theme.css.erb +1 -1
  51. metadata +3 -3
data/History.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # master
2
2
 
3
+ # 2.0.2
4
+
5
+ * Upgrade to jQuery UI 1.8.24
6
+
3
7
  # 2.0.1
4
8
 
5
9
  * Add draggable and resizable to the dependencies of dialog (#1)
@@ -1,7 +1,7 @@
1
1
  module Jquery
2
2
  module Ui
3
3
  module Rails
4
- VERSION = "2.0.1"
4
+ VERSION = "2.0.2"
5
5
  end
6
6
  end
7
7
  end
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Blind 1.8.23
4
+ * jQuery UI Effects Blind 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Bounce 1.8.23
4
+ * jQuery UI Effects Bounce 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Clip 1.8.23
4
+ * jQuery UI Effects Clip 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Effects 1.8.23
2
+ * jQuery UI Effects 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -307,7 +307,7 @@ $.fn.extend({
307
307
  /******************************************************************************/
308
308
 
309
309
  $.extend($.effects, {
310
- version: "1.8.23",
310
+ version: "1.8.24",
311
311
 
312
312
  // Saves a set of properties in a data storage
313
313
  save: function(element, set) {
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Drop 1.8.23
4
+ * jQuery UI Effects Drop 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Explode 1.8.23
4
+ * jQuery UI Effects Explode 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Fade 1.8.23
4
+ * jQuery UI Effects Fade 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Fold 1.8.23
4
+ * jQuery UI Effects Fold 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Highlight 1.8.23
4
+ * jQuery UI Effects Highlight 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Pulsate 1.8.23
4
+ * jQuery UI Effects Pulsate 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Scale 1.8.23
4
+ * jQuery UI Effects Scale 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Shake 1.8.23
4
+ * jQuery UI Effects Shake 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Slide 1.8.23
4
+ * jQuery UI Effects Slide 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery.effects.core
2
2
 
3
3
  /*!
4
- * jQuery UI Effects Transfer 1.8.23
4
+ * jQuery UI Effects Transfer 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -2,7 +2,7 @@
2
2
  //= require jquery.ui.widget
3
3
 
4
4
  /*!
5
- * jQuery UI Accordion 1.8.23
5
+ * jQuery UI Accordion 1.8.24
6
6
  *
7
7
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
8
8
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -521,7 +521,7 @@ $.widget( "ui.accordion", {
521
521
  });
522
522
 
523
523
  $.extend( $.ui.accordion, {
524
- version: "1.8.23",
524
+ version: "1.8.24",
525
525
  animations: {
526
526
  slide: function( options, additions ) {
527
527
  options = $.extend({
@@ -3,7 +3,7 @@
3
3
  //= require jquery.ui.position
4
4
 
5
5
  /*!
6
- * jQuery UI Autocomplete 1.8.23
6
+ * jQuery UI Autocomplete 1.8.24
7
7
  *
8
8
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
9
9
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -2,7 +2,7 @@
2
2
  //= require jquery.ui.widget
3
3
 
4
4
  /*!
5
- * jQuery UI Button 1.8.23
5
+ * jQuery UI Button 1.8.24
6
6
  *
7
7
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
8
8
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,7 +1,7 @@
1
1
  //= require jquery
2
2
 
3
3
  /*!
4
- * jQuery UI 1.8.23
4
+ * jQuery UI 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -20,7 +20,7 @@ if ( $.ui.version ) {
20
20
  }
21
21
 
22
22
  $.extend( $.ui, {
23
- version: "1.8.23",
23
+ version: "1.8.24",
24
24
 
25
25
  keyCode: {
26
26
  ALT: 18,
@@ -8,8 +8,8 @@ jQuery(function($){
8
8
  currentText: '今天',
9
9
  monthNames: ['一月','二月','三月','四月','五月','六月',
10
10
  '七月','八月','九月','十月','十一月','十二月'],
11
- monthNamesShort: ['','','','','','',
12
- '','','','','十一','十二'],
11
+ monthNamesShort: ['一月','二月','三月','四月','五月','六月',
12
+ '七月','八月','九月','十月','十一月','十二月'],
13
13
  dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
14
14
  dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
15
15
  dayNamesMin: ['日','一','二','三','四','五','六'],
@@ -8,8 +8,8 @@ jQuery(function($){
8
8
  currentText: '今天',
9
9
  monthNames: ['一月','二月','三月','四月','五月','六月',
10
10
  '七月','八月','九月','十月','十一月','十二月'],
11
- monthNamesShort: ['','','','','','',
12
- '','','','','十一','十二'],
11
+ monthNamesShort: ['一月','二月','三月','四月','五月','六月',
12
+ '七月','八月','九月','十月','十一月','十二月'],
13
13
  dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
14
14
  dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
15
15
  dayNamesMin: ['日','一','二','三','四','五','六'],
@@ -8,8 +8,8 @@ jQuery(function($){
8
8
  currentText: '今天',
9
9
  monthNames: ['一月','二月','三月','四月','五月','六月',
10
10
  '七月','八月','九月','十月','十一月','十二月'],
11
- monthNamesShort: ['','','','','','',
12
- '','','','','十一','十二'],
11
+ monthNamesShort: ['一月','二月','三月','四月','五月','六月',
12
+ '七月','八月','九月','十月','十一月','十二月'],
13
13
  dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
14
14
  dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
15
15
  dayNamesMin: ['日','一','二','三','四','五','六'],
@@ -1,7 +1,7 @@
1
1
  //= require jquery.ui.core
2
2
 
3
3
  /*!
4
- * jQuery UI Datepicker 1.8.23
4
+ * jQuery UI Datepicker 1.8.24
5
5
  *
6
6
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
7
7
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -14,7 +14,7 @@
14
14
  */
15
15
  (function( $, undefined ) {
16
16
 
17
- $.extend($.ui, { datepicker: { version: "1.8.23" } });
17
+ $.extend($.ui, { datepicker: { version: "1.8.24" } });
18
18
 
19
19
  var PROP_NAME = 'datepicker';
20
20
  var dpuuid = new Date().getTime();
@@ -1847,7 +1847,7 @@ $.fn.datepicker = function(options){
1847
1847
  $.datepicker = new Datepicker(); // singleton instance
1848
1848
  $.datepicker.initialized = false;
1849
1849
  $.datepicker.uuid = new Date().getTime();
1850
- $.datepicker.version = "1.8.23";
1850
+ $.datepicker.version = "1.8.24";
1851
1851
 
1852
1852
  // Workaround for #4055
1853
1853
  // Add another global to avoid noConflict issues with inline event handlers
@@ -5,7 +5,7 @@
5
5
  //= require jquery.ui.resizable
6
6
 
7
7
  /*!
8
- * jQuery UI Dialog 1.8.23
8
+ * jQuery UI Dialog 1.8.24
9
9
  *
10
10
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
11
11
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -696,7 +696,7 @@ $.widget("ui.dialog", {
696
696
  });
697
697
 
698
698
  $.extend($.ui.dialog, {
699
- version: "1.8.23",
699
+ version: "1.8.24",
700
700
 
701
701
  uuid: 0,
702
702
  maxZ: 0,
@@ -3,7 +3,7 @@
3
3
  //= require jquery.ui.mouse
4
4
 
5
5
  /*!
6
- * jQuery UI Draggable 1.8.23
6
+ * jQuery UI Draggable 1.8.24
7
7
  *
8
8
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
9
9
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -241,11 +241,10 @@ $.widget("ui.draggable", $.ui.mouse, {
241
241
  },
242
242
 
243
243
  _mouseUp: function(event) {
244
- if (this.options.iframeFix === true) {
245
- $("div.ui-draggable-iframeFix").each(function() {
246
- this.parentNode.removeChild(this);
247
- }); //Remove frame helpers
248
- }
244
+ //Remove frame helpers
245
+ $("div.ui-draggable-iframeFix").each(function() {
246
+ this.parentNode.removeChild(this);
247
+ });
249
248
 
250
249
  //If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
251
250
  if( $.ui.ddmanager ) $.ui.ddmanager.dragStop(this, event);
@@ -517,7 +516,7 @@ $.widget("ui.draggable", $.ui.mouse, {
517
516
  });
518
517
 
519
518
  $.extend($.ui.draggable, {
520
- version: "1.8.23"
519
+ version: "1.8.24"
521
520
  });
522
521
 
523
522
  $.ui.plugin.add("draggable", "connectToSortable", {
@@ -4,7 +4,7 @@
4
4
  //= require jquery.ui.draggable
5
5
 
6
6
  /*!
7
- * jQuery UI Droppable 1.8.23
7
+ * jQuery UI Droppable 1.8.24
8
8
  *
9
9
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
10
10
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -152,7 +152,7 @@ $.widget("ui.droppable", {
152
152
  });
153
153
 
154
154
  $.extend($.ui.droppable, {
155
- version: "1.8.23"
155
+ version: "1.8.24"
156
156
  });
157
157
 
158
158
  $.ui.intersect = function(draggable, droppable, toleranceMode) {
@@ -265,7 +265,12 @@ $.ui.ddmanager = {
265
265
 
266
266
  var parentInstance;
267
267
  if (this.options.greedy) {
268
- var parent = this.element.parents(':data(droppable):eq(0)');
268
+ // find droppable parents with same scope
269
+ var scope = this.options.scope;
270
+ var parent = this.element.parents(':data(droppable)').filter(function () {
271
+ return $.data(this, 'droppable').options.scope === scope;
272
+ });
273
+
269
274
  if (parent.length) {
270
275
  parentInstance = $.data(parent[0], 'droppable');
271
276
  parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
@@ -2,7 +2,7 @@
2
2
  //= require jquery.ui.widget
3
3
 
4
4
  /*!
5
- * jQuery UI Mouse 1.8.23
5
+ * jQuery UI Mouse 1.8.24
6
6
  *
7
7
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
8
8
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Position 1.8.23
2
+ * jQuery UI Position 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -2,7 +2,7 @@
2
2
  //= require jquery.ui.widget
3
3
 
4
4
  /*!
5
- * jQuery UI Progressbar 1.8.23
5
+ * jQuery UI Progressbar 1.8.24
6
6
  *
7
7
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
8
8
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -106,7 +106,7 @@ $.widget( "ui.progressbar", {
106
106
  });
107
107
 
108
108
  $.extend( $.ui.progressbar, {
109
- version: "1.8.23"
109
+ version: "1.8.24"
110
110
  });
111
111
 
112
112
  })( jQuery );
@@ -3,7 +3,7 @@
3
3
  //= require jquery.ui.mouse
4
4
 
5
5
  /*!
6
- * jQuery UI Resizable 1.8.23
6
+ * jQuery UI Resizable 1.8.24
7
7
  *
8
8
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
9
9
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -544,7 +544,7 @@ $.widget("ui.resizable", $.ui.mouse, {
544
544
  });
545
545
 
546
546
  $.extend($.ui.resizable, {
547
- version: "1.8.23"
547
+ version: "1.8.24"
548
548
  });
549
549
 
550
550
  /*
@@ -3,7 +3,7 @@
3
3
  //= require jquery.ui.mouse
4
4
 
5
5
  /*!
6
- * jQuery UI Selectable 1.8.23
6
+ * jQuery UI Selectable 1.8.24
7
7
  *
8
8
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
9
9
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -265,7 +265,7 @@ $.widget("ui.selectable", $.ui.mouse, {
265
265
  });
266
266
 
267
267
  $.extend($.ui.selectable, {
268
- version: "1.8.23"
268
+ version: "1.8.24"
269
269
  });
270
270
 
271
271
  })(jQuery);
@@ -3,7 +3,7 @@
3
3
  //= require jquery.ui.mouse
4
4
 
5
5
  /*!
6
- * jQuery UI Slider 1.8.23
6
+ * jQuery UI Slider 1.8.24
7
7
  *
8
8
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
9
9
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -660,7 +660,7 @@ $.widget( "ui.slider", $.ui.mouse, {
660
660
  });
661
661
 
662
662
  $.extend( $.ui.slider, {
663
- version: "1.8.23"
663
+ version: "1.8.24"
664
664
  });
665
665
 
666
666
  }(jQuery));
@@ -3,7 +3,7 @@
3
3
  //= require jquery.ui.mouse
4
4
 
5
5
  /*!
6
- * jQuery UI Sortable 1.8.23
6
+ * jQuery UI Sortable 1.8.24
7
7
  *
8
8
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
9
9
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -300,7 +300,16 @@ $.widget("ui.sortable", $.ui.mouse, {
300
300
  var item = this.items[i], itemElement = item.item[0], intersection = this._intersectsWithPointer(item);
301
301
  if (!intersection) continue;
302
302
 
303
- if(itemElement != this.currentItem[0] //cannot intersect with itself
303
+ // Only put the placeholder inside the current Container, skip all
304
+ // items form other containers. This works because when moving
305
+ // an item from one container to another the
306
+ // currentContainer is switched before the placeholder is moved.
307
+ //
308
+ // Without this moving items in "sub-sortables" can cause the placeholder to jitter
309
+ // beetween the outer and inner container.
310
+ if (item.instance !== this.currentContainer) continue;
311
+
312
+ if (itemElement != this.currentItem[0] //cannot intersect with itself
304
313
  && this.placeholder[intersection == 1 ? "next" : "prev"]()[0] != itemElement //no useless actions that have been done before
305
314
  && !$.ui.contains(this.placeholder[0], itemElement) //no action if the item moved is the parent of the item checked
306
315
  && (this.options.type == 'semi-dynamic' ? !$.ui.contains(this.element[0], itemElement) : true)
@@ -1007,15 +1016,16 @@ $.widget("ui.sortable", $.ui.mouse, {
1007
1016
 
1008
1017
  if(this.fromOutside && !noPropagation) delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
1009
1018
  if((this.fromOutside || this.domPosition.prev != this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent != this.currentItem.parent()[0]) && !noPropagation) delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
1010
- if(!$.ui.contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
1011
- if(!noPropagation) delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
1012
- for (var i = this.containers.length - 1; i >= 0; i--){
1013
- if($.ui.contains(this.containers[i].element[0], this.currentItem[0]) && !noPropagation) {
1014
- delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
1015
- delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this)); }; }).call(this, this.containers[i]));
1016
- }
1017
- };
1018
- };
1019
+
1020
+ // Check if the items Container has Changed and trigger appropriate
1021
+ // events.
1022
+ if (this !== this.currentContainer) {
1023
+ if(!noPropagation) {
1024
+ delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
1025
+ delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); }; }).call(this, this.currentContainer));
1026
+ delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this)); }; }).call(this, this.currentContainer));
1027
+ }
1028
+ }
1019
1029
 
1020
1030
  //Post events to containers
1021
1031
  for (var i = this.containers.length - 1; i >= 0; i--){
@@ -1082,7 +1092,7 @@ $.widget("ui.sortable", $.ui.mouse, {
1082
1092
  });
1083
1093
 
1084
1094
  $.extend($.ui.sortable, {
1085
- version: "1.8.23"
1095
+ version: "1.8.24"
1086
1096
  });
1087
1097
 
1088
1098
  })(jQuery);
@@ -2,7 +2,7 @@
2
2
  //= require jquery.ui.widget
3
3
 
4
4
  /*!
5
- * jQuery UI Tabs 1.8.23
5
+ * jQuery UI Tabs 1.8.24
6
6
  *
7
7
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
8
8
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -701,7 +701,7 @@ $.widget( "ui.tabs", {
701
701
  });
702
702
 
703
703
  $.extend( $.ui.tabs, {
704
- version: "1.8.23"
704
+ version: "1.8.24"
705
705
  });
706
706
 
707
707
  /*
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Widget 1.8.23
2
+ * jQuery UI Widget 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Accordion 1.8.23
2
+ * jQuery UI Accordion 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI CSS Framework 1.8.23
2
+ * jQuery UI CSS Framework 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Autocomplete 1.8.23
2
+ * jQuery UI Autocomplete 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -17,7 +17,7 @@
17
17
  * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
18
18
 
19
19
  /*
20
- * jQuery UI Menu 1.8.23
20
+ * jQuery UI Menu 1.8.24
21
21
  *
22
22
  * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
23
23
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI CSS Framework 1.8.23
2
+ * jQuery UI CSS Framework 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Button 1.8.23
2
+ * jQuery UI Button 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI CSS Framework 1.8.23
2
+ * jQuery UI CSS Framework 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Datepicker 1.8.23
2
+ * jQuery UI Datepicker 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Dialog 1.8.23
2
+ * jQuery UI Dialog 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Progressbar 1.8.23
2
+ * jQuery UI Progressbar 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Resizable 1.8.23
2
+ * jQuery UI Resizable 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Selectable 1.8.23
2
+ * jQuery UI Selectable 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Slider 1.8.23
2
+ * jQuery UI Slider 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI Tabs 1.8.23
2
+ * jQuery UI Tabs 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * jQuery UI CSS Framework 1.8.23
2
+ * jQuery UI CSS Framework 1.8.24
3
3
  *
4
4
  * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
5
5
  * Dual licensed under the MIT or GPL Version 2 licenses.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jquery-ui-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.1
4
+ version: 2.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-24 00:00:00.000000000 Z
12
+ date: 2012-09-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: railties
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
222
222
  version: '0'
223
223
  segments:
224
224
  - 0
225
- hash: -3883854818130885329
225
+ hash: 574798801838367756
226
226
  required_rubygems_version: !ruby/object:Gem::Requirement
227
227
  none: false
228
228
  requirements: