(bug 27833) CollapsibleTabs doesn't collapse tabs due to JS errors

* Change remove() to detach() so .data() isn't lost
* Be more careful using the parent's .data() in addData()
* Change ele (which mysteriously isn't available in the closure) to this, they're the same anyway

diff --git a/resources/jquery/jquery.collapsibleTabs.js b/resources/jquery/jquery.collapsibleTabs.js
index 47811b0..1c68250 100644 (file)
--- a/resources/jquery/jquery.collapsibleTabs.js
+++ b/resources/jquery/jquery.collapsibleTabs.js
@@ -49,12 +49,14 @@
                },
                addData: function( $collapsible ) {
                        var $settings = $collapsible.parent().data( 'collapsibleTabsSettings' );
-                       $collapsible.data( 'collapsibleTabsSettings', {
-                               'expandedContainer': $settings.expandedContainer,
-                               'collapsedContainer': $settings.collapsedContainer,
-                               'expandedWidth': $collapsible.width(),
-                               'prevElement': $collapsible.prev()
-                       } );
+                       if ( typeof $settings != 'undefined' ) {
+                               $collapsible.data( 'collapsibleTabsSettings', {
+                                       'expandedContainer': $settings.expandedContainer,
+                                       'collapsedContainer': $settings.collapsedContainer,
+                                       'expandedWidth': $collapsible.width(),
+                                       'prevElement': $collapsible.prev()
+                               } );
+                       }
                },
                getSettings: function( $collapsible ) {
                        var $settings = $collapsible.data( 'collapsibleTabsSettings' );
@@ -95,7 +97,7 @@
                        var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer );
                        dataExp.shifting = true;
                        $moving
-                               .remove()
+                               .detach()
                                .prependTo( data.collapsedContainer )
                                .data( 'collapsibleTabsSettings', data );
                        dataExp.shifting = false;
@@ -107,7 +109,7 @@
                        var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer );
                        dataExp.shifting = true;
                        // remove this element from where it's at and put it in the dropdown menu
-                       $moving.remove().insertAfter( data.prevElement ).data( 'collapsibleTabsSettings', data );
+                       $moving.detach().insertAfter( data.prevElement ).data( 'collapsibleTabsSettings', data );
                        dataExp.shifting = false;
                        $.collapsibleTabs.handleResize();
                }