Skip to content

Commit 342aee7

Browse files
committed
Updated angular-bootstrap dependency to 13.0
Includes important commit angular-ui/bootstrap@91b5fb6 which means it does not force selection of any tab by default. Also changes 'disabled' property in tabs to 'disable' (to fix ie9 issues) - see angular-ui/bootstrap#2677
1 parent edf6643 commit 342aee7

10 files changed

+1909
-717
lines changed

README.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,8 @@ Leverages [UI Bootstrap](http://angular-ui.github.io/bootstrap/) and [UI Router]
7171

7272
## Tips
7373

74-
* UI Bootstrap Tabs will always select one tab by default. There is a fix in `master` for `ui-bootstrap` so this
75-
should be fixed by upgrading when a new version of this is released. See [#ui-bootstrap-commit](https://github.com/angular-ui/bootstrap/commit/91b5fb62eedbb600d6a6abe32376846f327a903d)
76-
* You should link to the `ui-view` containing the tabs with the default (first) element as the sub-route (ie. `example/#/user/settings` in the example).
74+
* UI Bootstrap Tabs will not select a tab by default. If you want it to, specify the target sub-route when you
75+
show the tabs (ie. link the `ui-view` containing the tabs with the default (first) element as the sub-route `example/#/user/settings` in the example.)
7776
* You can override the default directive template by specifying `template-url="my_template.html"` on the `<tabs>` element.
7877
* You can enable / disable tabs by specifying `disabled: true` in the `tabData` (can be dynamically set).
7978
* You can use `<tab-heading>` in a custom directive template to add any HTML into the tab title.

bower.json

+1-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
],
2323
"dependencies": {
2424
"angular": "^1.3.15",
25-
"angular-bootstrap": "^0.12.1",
25+
"angular-bootstrap": "^0.13.0",
2626
"angular-ui-router": "^0.2.14"
2727
},
2828
"devDependencies": {
@@ -32,8 +32,5 @@
3232
"underscore": "~1.7.0",
3333
"jquery": "~2.1.1",
3434
"bootstrap": "~3.2.0"
35-
},
36-
"resolutions": {
37-
"angular": "^1.3.15"
3835
}
3936
}

bower_components/angular-bootstrap/.bower.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
"license": "MIT",
1212
"ignore": [],
1313
"description": "Native AngularJS (Angular) directives for Bootstrap.",
14-
"version": "0.12.1",
14+
"version": "0.13.0",
1515
"main": [
1616
"./ui-bootstrap-tpls.js"
1717
],
1818
"dependencies": {
19-
"angular": ">=1 <1.3.0"
19+
"angular": ">=1.3.0"
2020
},
2121
"homepage": "https://github.com/angular-ui/bootstrap-bower",
22-
"_release": "0.12.1",
22+
"_release": "0.13.0",
2323
"_resolution": {
2424
"type": "version",
25-
"tag": "0.12.1",
26-
"commit": "ab14fbaaf3d592f8e76018f0666c5af6f68ebaa3"
25+
"tag": "0.13.0",
26+
"commit": "a75d899addcafb73344b724bec647620adeebc9a"
2727
},
2828
"_source": "git://github.com/angular-ui/bootstrap-bower.git",
29-
"_target": "^0.12.1",
29+
"_target": "^0.13.0",
3030
"_originalSource": "angular-bootstrap"
3131
}

bower_components/angular-bootstrap/bower.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
"license": "MIT",
1212
"ignore": [],
1313
"description": "Native AngularJS (Angular) directives for Bootstrap.",
14-
"version": "0.12.1",
14+
"version": "0.13.0",
1515
"main": ["./ui-bootstrap-tpls.js"],
1616
"dependencies": {
17-
"angular": ">=1 <1.3.0"
18-
}
17+
"angular": ">=1.3.0"
18+
}
1919
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* Include this file in your html if you are using the CSP mode. */
2+
3+
.ng-animate.item:not(.left):not(.right) {
4+
-webkit-transition: 0s ease-in-out left;
5+
transition: 0s ease-in-out left
6+
}

0 commit comments

Comments
 (0)