Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
thanh-nguyen committed Jan 15, 2014
1 parent ceb396f commit c692270
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
12 changes: 8 additions & 4 deletions src/tabs/tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,14 @@ function($parse, $http, $templateCache, $compile) {
if (!scope.$eval(attrs.tabsetTitles)) {
elm.remove();
} else {
//now that tabs location has been decided, transclude the tab titles in
tabsetCtrl.$transcludeFn(tabsetCtrl.$scope.$parent, function(node) {
elm.append(node);
});
// reference: https://github.com/angular-ui/bootstrap/issues/783
setTimeout(function() {
//now that tabs location has been decided, transclude the tab titles in
tabsetCtrl.$transcludeFn(tabsetCtrl.$scope.$parent, function(node) {
elm.append(node);
});
scope.$apply();
},1);
}
}
};
Expand Down
4 changes: 2 additions & 2 deletions template/tabs/tabset.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

<div class="tabbable" ng-class="{'tabs-right': direction == 'right', 'tabs-left': direction == 'left', 'tabs-below': direction == 'below'}">
<div tabset-titles="tabsAbove"></div>
<div tabset-titles="!tabsAbove"></div>
<div class="tab-content">
<div class="tab-pane"
ng-repeat="tab in tabs"
ng-class="{active: tab.active}"
tab-content-transclude="tab">
</div>
</div>
<div tabset-titles="!tabsAbove"></div>
<!-- <div tabset-titles="!tabsAbove"></div> -->
</div>

0 comments on commit c692270

Please sign in to comment.