github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-04-07 03:00:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

now working for navbarPage and navlistPanel

Browse Source
This commit is contained in:
Barbara Borges Ribeiro
2017-07-18 20:50:19 +01:00
parent 0ecdcec698
commit a4c086f51b
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
R/bootstrap.R
View File

@@ -838,8 +838,8 @@ buildTabset <- function(tabs, ulClass, textFilter = NULL,
}
tabsetId <- p_randomInt(1000, 10000)
tabNavList <- tags$ul(class = ulClass, id = id, `data-tabsetId` = tabsetId)
tabContent <- tags$div(class = "tab-content")
tabNavList <- tags$ul(class = ulClass, id = id, `data-tabsetid` = tabsetId)
tabContent <- tags$div(class = "tab-content", `data-tabsetid` = tabsetId)
tabId <- 1

6
inst/www/shared/shiny.js
View File

@@ -1346,12 +1346,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
var prevTabIds = [];
$tabsetPanel.find("> li").each(function () {
prevTabIds.push($(this).find('> a').attr('href').replace(leadingHref, ''));
var $prevTabs = $(this).find('> a[data-toggle="tab"]');
if ($prevTabs.length > 0) prevTabIds.push($prevTabs.attr('href').replace(leadingHref, ''));
});
prevTabIds = prevTabIds.map(Number);
var tabId = Math.max.apply(null, prevTabIds) + 1;
var thisId = "tab-" + $tabsetPanel.attr("data-tabsetid") + "-" + tabId;
var icon = message.icon.html;
// if there is an icon, render the possible deps
@@ -1367,7 +1367,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
var $divTag = $tab.attr("id", thisId);
$divTag.removeAttr("title");
var $tabContent = $tabsetPanel.find("+ .tab-content");
var $tabContent = $("div.tab-content[data-tabsetid='" + $tabsetPanel.attr("data-tabsetid") + "']");
if (message.target === null) {
if (message.position === "left") {

2
inst/www/shared/shiny.js.map
View File

File diff suppressed because one or more lines are too long

6
inst/www/shared/shiny.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
inst/www/shared/shiny.min.js.map
View File

File diff suppressed because one or more lines are too long

8
srcjs/shinyapp.js
View File

@@ -727,12 +727,13 @@ var ShinyApp = function() {
var prevTabIds = [];
$tabsetPanel.find("> li").each(function(){
prevTabIds.push($(this).find('> a').attr('href').replace(leadingHref,''));
var $prevTabs = $(this).find('> a[data-toggle="tab"]');
if ($prevTabs.length > 0)
prevTabIds.push($prevTabs.attr('href').replace(leadingHref,''));
});
prevTabIds = prevTabIds.map(Number);
var tabId = Math.max.apply(null, prevTabIds) + 1;
var thisId = "tab-" + $tabsetPanel.attr("data-tabsetid") + "-" + tabId;
var icon = message.icon.html;
// if there is an icon, render the possible deps
@@ -748,8 +749,7 @@ var ShinyApp = function() {
var $divTag = $tab.attr("id", thisId);
$divTag.removeAttr("title");
var $tabContent = $tabsetPanel.find("+ .tab-content");
var $tabContent = $("div.tab-content[data-tabsetid='" + $tabsetPanel.attr("data-tabsetid") + "']");
if (message.target === null) {
if (message.position === "left") {