Skip to content

Commit

Permalink
fix(modals): update angular-bootstrap to fix modal flickering issue
Browse files Browse the repository at this point in the history
Close akveo#45
  • Loading branch information
lugovsky committed Jun 13, 2016
1 parent cce483b commit 7f05a1e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"chartist": "0.9.5",
"angular-morris-chart": "~1.1.0",
"ionrangeslider": "~2.1.2",
"angular-bootstrap": "~0.14.3",
"angular-bootstrap": "~1.3.3",
"angular-animate": "~1.4.8",
"textAngular": "~1.4.6",
"angular-xeditable": "~0.1.9",
Expand Down
8 changes: 4 additions & 4 deletions src/app/pages/ui/tabs/mainTabs.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<uib-tabset>
<uib-tabset active="$tabSetStatus.activeTab">
<uib-tab heading="Start">
<p>
Take up one idea. Make that one idea your life--think of it, dream of it, live on that idea. Let the brain,
Expand Down Expand Up @@ -43,9 +43,9 @@
<a uib-dropdown-toggle ng-click="$event.stopPropagation()">
Dropdown tab <i class="caret"></i>
</a>
<ul class="uib-dropdown-menu">
<li><a ng-click="$dropdownTabActive = 1">Tab 1</a></li>
<li><a ng-click="$dropdownTabActive = 2">Tab 2</a></li>
<ul class="dropdown-menu" uib-dropdown-menu>
<li><a ng-click="$dropdownTabActive = 1; $tabSetStatus.activeTab = 3">Tab 1</a></li>
<li><a ng-click="$dropdownTabActive = 2; $tabSetStatus.activeTab = 3">Tab 2</a></li>
</ul>
</uib-tab-heading>
<div ng-show="$dropdownTabActive == 1">
Expand Down

0 comments on commit 7f05a1e

Please sign in to comment.