Skip to content

Commit

Permalink
Disable tab state logic on uninit'ed tabs, allow opt-out
Browse files Browse the repository at this point in the history
Fixes a problem when switching between ajax tabs,
e.g. "Content" and "Settings" in admin/pages/edit/show/<id>.
  • Loading branch information
chillu committed Jul 13, 2012
1 parent c493dc7 commit bf91594
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion admin/javascript/LeftAndMain.js
Expand Up @@ -444,6 +444,8 @@ jQuery.noConflict();
this.find('.cms-tabset,.ss-tabset').each(function(i, el) {
var id = $(el).attr('id');
if(!id) return; // we need a unique reference
if(!$(el).data('tabs')) return; // don't act on uninit'ed controls
if($(el).data('ignoreTabState')) return; // allow opt-out
selectedTabs.push({id:id, selected:$(el).tabs('option', 'selected')});
});
if(selectedTabs) window.sessionStorage.setItem('tabs-' + url, JSON.stringify(selectedTabs));
Expand All @@ -461,7 +463,9 @@ jQuery.noConflict();
selectedTabs = data ? JSON.parse(data) : false;
if(selectedTabs) {
$.each(selectedTabs, function(i, selectedTab) {
self.find('#' + selectedTab.id).tabs('select', selectedTab.selected);
var el = self.find('#' + selectedTab.id);
if(!el.data('tabs')) return; // don't act on uninit'ed controls
el.tabs('select', selectedTab.selected);
});
}
},
Expand Down

0 comments on commit bf91594

Please sign in to comment.