From 4391d9a2866c76081b5831c475d6f6b27ef36a55 Mon Sep 17 00:00:00 2001
From: Nathan Williams
Date: Fri, 11 Jul 2014 01:50:07 -0400
Subject: [PATCH 1/3] chore rebase from master
---
.jshintrc | 18 +-
.travis.yml | 4 +-
CHANGELOG.md | 103 +
CONTRIBUTING.md | 32 +
Gruntfile.js | 98 +-
README.md | 203 +-
ROADMAP.md | 90 -
karma.conf.js | 126 +-
misc/demo/assets/app.js | 251 +-
misc/demo/assets/favicon.ico | Bin 0 -> 1150 bytes
misc/demo/assets/uglifyjs.js | 4 +
misc/demo/index.html | 23 +-
misc/raw-files-generator.js | 46 +
misc/test-lib/angular-mocks.js | 2163 --
misc/test-lib/angular.js | 21464 ----------------
misc/test-lib/helpers.js | 59 +-
package.json | 38 +-
src/accordion/accordion.js | 6 +-
src/accordion/docs/readme.md | 7 +-
src/accordion/test/accordion.spec.js | 5 +-
src/alert/alert.js | 14 +-
src/alert/docs/readme.md | 4 +-
src/alert/test/dismissOnTimeout.spec.js | 21 +
src/buttons/test/buttons.spec.js | 44 +-
src/carousel/carousel.css | 4 +
src/carousel/carousel.js | 158 +-
src/carousel/docs/demo.html | 2 +-
src/carousel/docs/demo.js | 2 +-
src/carousel/test/carousel.spec.js | 122 +-
src/collapse/collapse.js | 65 +-
src/collapse/test/collapse.spec.js | 25 +-
src/dateparser/dateparser.js | 35 +-
src/dateparser/test/dateparser.spec.js | 64 +-
src/datepicker/datepicker.js | 143 +-
src/datepicker/docs/demo.html | 14 +-
src/datepicker/docs/demo.js | 32 +
src/datepicker/docs/readme.md | 12 +-
src/datepicker/test/datepicker.spec.js | 367 +-
src/dropdown/docs/demo.html | 22 +-
src/dropdown/docs/demo.js | 4 +-
src/dropdown/docs/readme.md | 10 +
src/dropdown/dropdown.js | 69 +-
src/dropdown/test/dropdown.spec.js | 173 +-
src/modal/docs/demo.html | 1 +
src/modal/docs/demo.js | 8 +
src/modal/docs/readme.md | 9 +-
src/modal/modal.js | 241 +-
src/modal/test/modal.spec.js | 406 +-
src/modal/test/modalWindow.spec.js | 8 +-
src/pagination/docs/demo.js | 4 +-
src/pagination/docs/readme.md | 4 +
src/pagination/pagination.js | 33 +-
src/pagination/test/pager.spec.js | 35 +-
src/pagination/test/pagination.spec.js | 87 +-
src/popover/docs/demo.html | 21 +-
src/popover/docs/demo.js | 7 +-
src/popover/docs/readme.md | 7 +
src/popover/popover.js | 14 +
src/popover/test/popover-template.spec.js | 66 +
src/popover/test/popover.spec.js | 34 +-
src/position/test/position.spec.js | 26 +-
src/position/test/test.html | 2 +-
src/progressbar/progressbar.js | 6 +-
src/progressbar/test/progressbar.spec.js | 11 +-
src/rating/rating.js | 12 +-
src/rating/test/rating.spec.js | 27 +-
src/tabs/docs/demo.html | 2 +-
src/tabs/docs/demo.js | 4 +-
src/tabs/docs/readme.md | 5 +-
src/tabs/tabs.js | 27 +-
src/tabs/test/tabs.spec.js | 67 +-
src/timepicker/docs/demo.js | 4 +-
src/timepicker/docs/readme.md | 8 +-
src/timepicker/test/timepicker.spec.js | 123 +-
src/timepicker/timepicker.js | 45 +-
src/tooltip/docs/demo.html | 44 +-
src/tooltip/docs/demo.js | 4 +-
src/tooltip/docs/readme.md | 19 +-
src/tooltip/test/tooltip-template.spec.js | 65 +
src/tooltip/test/tooltip.spec.js | 286 +-
src/tooltip/test/tooltip2.spec.js | 57 +-
src/tooltip/tooltip.js | 264 +-
src/transition/test/transition.spec.js | 2 +-
src/transition/transition.js | 9 +-
src/typeahead/docs/readme.md | 4 +
src/typeahead/test/typeahead.spec.js | 250 +-
src/typeahead/typeahead.js | 39 +-
template/accordion/accordion-group.html | 6 +-
template/carousel/carousel.html | 2 +-
template/carousel/slide.html | 6 +-
template/datepicker/day.html | 4 +-
template/datepicker/month.html | 2 +-
template/datepicker/popup.html | 2 +-
template/datepicker/year.html | 2 +-
template/modal/backdrop.html | 3 +-
template/modal/window.html | 8 +-
template/pagination/pager.html | 4 +-
template/pagination/pagination.html | 10 +-
template/popover/popover-template.html | 13 +
template/popover/popover.html | 7 +-
template/progressbar/bar.html | 2 +-
template/progressbar/progressbar.html | 4 +-
template/tabs/tab.html | 2 +-
template/timepicker/timepicker.html | 8 +-
template/tooltip/tooltip-html-popup.html | 7 +
.../tooltip/tooltip-html-unsafe-popup.html | 5 +-
template/tooltip/tooltip-popup.html | 2 +-
template/tooltip/tooltip-template-popup.html | 9 +
template/typeahead/typeahead-popup.html | 4 +-
109 files changed, 4003 insertions(+), 24652 deletions(-)
delete mode 100644 ROADMAP.md
create mode 100644 misc/demo/assets/favicon.ico
create mode 100644 misc/demo/assets/uglifyjs.js
create mode 100644 misc/raw-files-generator.js
delete mode 100644 misc/test-lib/angular-mocks.js
delete mode 100644 misc/test-lib/angular.js
create mode 100644 src/alert/test/dismissOnTimeout.spec.js
create mode 100644 src/carousel/carousel.css
create mode 100644 src/popover/test/popover-template.spec.js
create mode 100644 src/tooltip/test/tooltip-template.spec.js
create mode 100644 template/popover/popover-template.html
create mode 100644 template/tooltip/tooltip-html-popup.html
create mode 100644 template/tooltip/tooltip-template-popup.html
diff --git a/.jshintrc b/.jshintrc
index 7136edbda9..b36c317d67 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -8,7 +8,23 @@
"eqnull": true,
"quotmark": "single",
"trailing": true,
+ "undef": true,
+ "browser": true,
+ "jquery": true,
"globals": {
- "angular": true
+ "angular": false,
+
+ // For Jasmine
+ "after" : false,
+ "afterEach" : false,
+ "before" : false,
+ "beforeEach" : false,
+ "describe" : false,
+ "expect" : false,
+ "jasmine" : false,
+ "module" : false,
+ "spyOn" : false,
+ "inject" : false,
+ "it" : false
}
}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 1f6c981aca..cccd617de3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- - "0.10"
+ - "0.12"
before_script:
- export DISPLAY=:99.0
@@ -8,4 +8,4 @@
- npm install --quiet -g grunt-cli karma
- npm install
- script: grunt
\ No newline at end of file
+ script: grunt
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e661c93bc6..ae57d648cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,102 @@
+# 0.12.1 (2015-02-20)
+
+## Bug Fixes
+
+- **tooltip:**
+ - incorrect position when text wraps ([5726e3ef](http://github.com/angular-ui/bootstrap/commit/5726e3ef))
+
+
+# 0.12.0 (2014-11-16)
+
+
+## Bug Fixes
+
+* **accordion:** make header links keyboard accessible ([992b2329](http://github.com/angular-ui/bootstrap/commit/992b23297cd100ab4e236fba469e3a70566a4163), closes [#2869](http://github.com/angular-ui/bootstrap/issues/2869))
+* **build:** make custom builds on demo site work ([390f2bf6](http://github.com/angular-ui/bootstrap/commit/390f2bf6b0846ee640e86ad87bbae8c449e53026), closes [#2960](http://github.com/angular-ui/bootstrap/issues/2960), [#2847](http://github.com/angular-ui/bootstrap/issues/2847), [#2625](http://github.com/angular-ui/bootstrap/issues/2625), [#2489](http://github.com/angular-ui/bootstrap/issues/2489), [#2357](http://github.com/angular-ui/bootstrap/issues/2357), [#2176](http://github.com/angular-ui/bootstrap/issues/2176), [#2892](http://github.com/angular-ui/bootstrap/issues/2892))
+* **carousel:** replaced $timeout with $interval when it was wrong ([392c0ad1](http://github.com/angular-ui/bootstrap/commit/392c0ad13ca9b65be5e77ac0c68de24ead8ea2ce), closes [#1308](http://github.com/angular-ui/bootstrap/issues/1308), [#2454](http://github.com/angular-ui/bootstrap/issues/2454), [#2776](http://github.com/angular-ui/bootstrap/issues/2776))
+* **datepicker:** correct button alignment when using bootstrap v3.2.0 ([460fbec7](http://github.com/angular-ui/bootstrap/commit/460fbec776c6d08d0e7db40aedd29d10ac48d7e9), closes [#2728](http://github.com/angular-ui/bootstrap/issues/2728))
+* **demo:** initial load of fragment URLs ([eab6daf6](http://github.com/angular-ui/bootstrap/commit/eab6daf64b3c963d8e285e254c75af5f97c24ec1), closes [#2762](http://github.com/angular-ui/bootstrap/issues/2762))
+* **dropdown:**
+ * compatibility with `$location` url rewriting ([ef095170](http://github.com/angular-ui/bootstrap/commit/ef09517061b0b4c0c9e9f85086635af33207ec54), closes [#2343](http://github.com/angular-ui/bootstrap/issues/2343))
+ * remove `C` restrictions to avoid conflicts ([192768e1](http://github.com/angular-ui/bootstrap/commit/192768e109b5c4a50c7dcd320e09d05fedd4298a), closes [#2156](http://github.com/angular-ui/bootstrap/issues/2156), [#2170](http://github.com/angular-ui/bootstrap/issues/2170))
+* **tabs:**
+ * make tab links keyboard accessible ([5df524b7](http://github.com/angular-ui/bootstrap/commit/5df524b77114bccdc9a49540e1eb52a564ee5dfd), closes [#2226](http://github.com/angular-ui/bootstrap/issues/2226), [#2290](http://github.com/angular-ui/bootstrap/issues/2290), [#2870](http://github.com/angular-ui/bootstrap/issues/2870), [#2304](http://github.com/angular-ui/bootstrap/issues/2304))
+ * don't select tabs on destroy ([9939867a](http://github.com/angular-ui/bootstrap/commit/9939867aba0b7b763588b18829b557c052ea69ba), closes [#2155](http://github.com/angular-ui/bootstrap/issues/2155), [#2596](http://github.com/angular-ui/bootstrap/issues/2596))
+* **tests:** usage of undefined variables ([34273ff0](http://github.com/angular-ui/bootstrap/commit/34273ff0107ecfa28438a7389d94ca619b8704e5))
+* **tooltip:**
+ * remove extra digest causing incompatibility ([32c4704b](http://github.com/angular-ui/bootstrap/commit/32c4704b748cecf2de4c651f2e5157c1ef6c88b1), closes [#2951](http://github.com/angular-ui/bootstrap/issues/2951), [#2959](http://github.com/angular-ui/bootstrap/issues/2959))
+ * show correct tooltip on `ng-repeat` ([b4832c4b](http://github.com/angular-ui/bootstrap/commit/b4832c4b551af7e580ed65d9e5aaee1ef9e6c53e), closes [#2935](http://github.com/angular-ui/bootstrap/issues/2935))
+ * memory leak on show/hide ([faf38d20](http://github.com/angular-ui/bootstrap/commit/faf38d20a49176f2016f7f7d4fa49a5c438a986e), closes [#2709](http://github.com/angular-ui/bootstrap/issues/2709), [#2919](http://github.com/angular-ui/bootstrap/issues/2919))
+ * remove child scope requirement ([8204c808](http://github.com/angular-ui/bootstrap/commit/8204c8088139165ac9b2ad3977a2c20570e434cb), closes [#1269](http://github.com/angular-ui/bootstrap/issues/1269), [#2320](http://github.com/angular-ui/bootstrap/issues/2320), [#2203](http://github.com/angular-ui/bootstrap/issues/2203))
+ * evaluate appendToBody on init ([e10d561f](http://github.com/angular-ui/bootstrap/commit/e10d561f92c2927be0ec429761fa229520fb9a51), closes [#2921](http://github.com/angular-ui/bootstrap/issues/2921))
+ * don't use an empty transclusion fn ([689c4d01](http://github.com/angular-ui/bootstrap/commit/689c4d017d303b6d758164ee12837a172bb01139), closes [#2825](http://github.com/angular-ui/bootstrap/issues/2825))
+* **typeahead:** don't leak DOM nodes ([1f6c3c92](http://github.com/angular-ui/bootstrap/commit/1f6c3c92af0e343c7e34b85ea6d270ac79bf6755))
+
+
+## Features
+
+* **alert:** allow alerts to be closed from a controller ([ca6fad67](http://github.com/angular-ui/bootstrap/commit/ca6fad675bf2aa793896bf3e086330667a5d9051), closes [#2399](http://github.com/angular-ui/bootstrap/issues/2399), [#2854](http://github.com/angular-ui/bootstrap/issues/2854))
+* **typeahead:** add focus-first option ([35d0cc1d](http://github.com/angular-ui/bootstrap/commit/35d0cc1d57302883840f7ad54a03918ae2df001d), closes [#908](http://github.com/angular-ui/bootstrap/issues/908), [#2916](http://github.com/angular-ui/bootstrap/issues/2916))
+
+
+## Breaking Changes
+
+* `tooltip-trigger` and `popover-trigger` are no longer watched
+attributes.
+([a65bea95](http://github.com/angular-ui/bootstrap/commit/a65bea95338802b026fd213805b095b5a0b5b393))
+This affects both popovers and tooltips. The *triggers are now set up
+once* and can no longer be changed after initialization.
+
+* `dropdown` and `dropdown-toggle` are attribute-only directives. ([192768e1](http://github.com/angular-ui/bootstrap/commit/192768e109b5c4a50c7dcd320e09d05fedd4298a))
+
+ Before:
+ ```html
+
+ FAQ
+ Please check our FAQ section for common problems / solutions.
<% demoModules.forEach(function(module) { %>
@@ -271,10 +276,15 @@
+
{{buildErrorText}}
-
+
<% modules.forEach(function(module,i) { %>
<% if (i % 3 === 0) {%>
@@ -295,7 +305,9 @@
{{buildErrorText}}
@@ -315,5 +327,6 @@
{{buildErrorText}}
+