Changeset 5546

Timestamp:

05/10/08 08:27:36 (8 months ago)

Author:

klaus.hartl

Message:

UI Tabs: was incorrectly assuming span element

Files:

• trunk/ui/ui.tabs.js (modified) (3 diffs)

trunk/ui/ui.tabs.js

@@ -427 +427 @@
             
             // no remote or from cache - just finish with callback
-            if (!url || ($.data(a, 'cache.tabs') && !bypassCache)) {
+            if (!url || !bypassCache && $.data(a, 'cache.tabs')) {
                 callback();
                 return;
             }
 
+            var inner = function(parent) {
+                var $parent = $(parent), $inner = $parent.find('*:last');
+                return $inner.length && $inner || $parent;
+            };
+            
             // load remote from here on
             if (o.spinner) {
-                var $span = $('span', a);
-                $span.data('label.tabs', $span.html()).html('<em>' + o.spinner + '</em>');
-            }
-            var finish = function() {
-                self.$tabs.filter('.' + o.loadingClass).each(function() {
-                    $(this).removeClass(o.loadingClass);
-                    if (o.spinner) {
-                        var $span = $('span', this);
-                        $span.html($span.data('label.tabs')).removeData('label.tabs');
-                    }
-                });
+                var label = inner(a).html();
+                inner(a).wrapInner('<em></em>')
+                    .find('em').data('label.tabs', label).html(o.spinner);
+            }
+            var cleanup = function() {
+                self.$tabs.filter('.' + o.loadingClass).removeClass(o.loadingClass)
+                            .each(function() {
+                                if (o.spinner)
+                                    inner(this).parent().html(inner(this).data('label.tabs'));
+                            });
                 self.xhr = null;
             };
@@ -451 +455 @@
                 success: function(r, s) {
                     $(a.hash).html(r);
-                    finish();
+                    cleanup();
                     
                     if (o.cache)
@@ -471 +475 @@
                 // terminate pending requests from other tabs and restore tab label
                 this.xhr.abort();
-                finish();
+                cleanup();
             }
             $a.addClass(o.loadingClass);