From 15f1add38bf8802a46a9db9cacb8c7e98b9661b5 Mon Sep 17 00:00:00 2001 From: jlukic Date: Fri, 20 Feb 2015 12:15:32 -0500 Subject: [PATCH] Fixes #1840, tab with ajax does not hide content correctly --- src/definitions/modules/tab.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/definitions/modules/tab.js b/src/definitions/modules/tab.js index 9af6746ef..7080b1e15 100644 --- a/src/definitions/modules/tab.js +++ b/src/definitions/modules/tab.js @@ -370,22 +370,22 @@ $.fn.tab = function(parameters) { cachedContent = module.cache.read(fullTabPath); + module.activate.tab(tabPath); + if(settings.cache && cachedContent) { module.debug('Showing existing content', fullTabPath); module.content.update(tabPath, cachedContent); - module.activate.tab(tabPath); settings.onTabLoad.call($tab, tabPath, parameterArray, historyEvent); } else if(existingRequest) { module.debug('Content is already loading', fullTabPath); - $tab - .addClass(className.loading) - ; + $tab.addClass(className.loading); } else if($.api !== undefined) { - requestSettings = $.extend(true, { headers: { 'X-Remote': true } }, settings.apiSettings, apiSettings); + requestSettings = $.extend(true, { + headers: { 'X-Remote': true } + }, settings.apiSettings, apiSettings); module.debug('Retrieving remote content', fullTabPath, requestSettings); - console.log(existingRequest, requestSettings, cachedContent); $tab.api( requestSettings ); } else {