Changeset 4888

Timestamp:

03/11/08 07:56:02 (5 months ago)

Author:

klaus.hartl

Message:

UI Tabs: replaced some more strange characters and fixed #2439

Files:

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

trunk/ui/ui.tabs.js

@@ -463 +463 @@
             
             var self = this, o = this.options, $a = this.$tabs.eq(index), a = $a[0],
-                    bypassCache = callback == undefined || callback === false, url = $a.data('load.ui-tabs');
-
-            callback = callback || function() {};
+                    bypassCache = callback == undefined || callback === false, url = $a.data('load.ui-tabs');
+
+            callback = callback || function() {};
             
             // no remote or from cache - just finish with callback
-            if (!url || ($.data(a, 'cache.ui-tabs') && !bypassCache)) {
+            if (!url || ($.data(a, 'cache.ui-tabs') && !bypassCache)) {
                 callback();
                 return;
@@ -475 +475 @@
             // load remote from here on
             if (o.spinner) {
-                var $span = $('span', a), label = $span.html();
-                $span.html('<em>' + o.spinner + '</em>');
+                var $span = $('span', a);
+                $span.data('label.ui-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)
-                        $('span', this).html(label);
+                    if (o.spinner) {
+                        var $span = $('span', this);
+                        $span.html($span.data('label.ui-tabs')).removeData('label.ui-tabs');
+                    }
                 });
                 self.xhr = null;