Permalink
Browse files

Merge pull request #56 from roverwolf/2.3.1-updates

2.3.1 updates
  • Loading branch information...
2 parents 6d4a356 + 2595956 commit bd54c3875e3aa5297a773c0c79f8f72494c02d76 @m5o m5o committed Mar 7, 2013
Showing with 311 additions and 259 deletions.
  1. +10 −0 CHANGELOG.md
  2. +176 −176 LICENSE
  3. +3 −3 Makefile
  4. +14 −13 README.md
  5. +1 −1 Rakefile
  6. +1 −1 bootstrap-2.3.0.css → bootstrap-2.3.1.css
  7. +1 −1 bootstrap-2.3.0.min.css → bootstrap-2.3.1.min.css
  8. +1 −1 bootstrap-responsive-2.3.0.css → bootstrap-responsive-2.3.1.css
  9. +1 −1 bootstrap-responsive-2.3.0.min.css → bootstrap-responsive-2.3.1.min.css
  10. +1 −1 component.json
  11. +1 −1 docs/assets/css/bootstrap-responsive.css
  12. +1 −1 docs/assets/css/bootstrap.css
  13. +1 −1 docs/assets/js/bootstrap-affix.js
  14. +1 −1 docs/assets/js/bootstrap-alert.js
  15. +1 −1 docs/assets/js/bootstrap-button.js
  16. +2 −2 docs/assets/js/bootstrap-carousel.js
  17. +1 −1 docs/assets/js/bootstrap-collapse.js
  18. +2 −2 docs/assets/js/bootstrap-dropdown.js
  19. +2 −2 docs/assets/js/bootstrap-modal.js
  20. +1 −1 docs/assets/js/bootstrap-popover.js
  21. +1 −1 docs/assets/js/bootstrap-scrollspy.js
  22. +1 −1 docs/assets/js/bootstrap-tab.js
  23. +10 −2 docs/assets/js/bootstrap-tooltip.js
  24. +1 −1 docs/assets/js/bootstrap-transition.js
  25. +1 −1 docs/assets/js/bootstrap-typeahead.js
  26. +25 −17 docs/assets/js/bootstrap.js
  27. +2 −2 docs/assets/js/bootstrap.min.js
  28. +1 −1 docs/index.html
  29. +2 −2 docs/templates/pages/index.mustache
  30. +1 −1 js/bootstrap-affix.js
  31. +1 −1 js/bootstrap-alert.js
  32. +1 −1 js/bootstrap-button.js
  33. +2 −2 js/bootstrap-carousel.js
  34. +1 −1 js/bootstrap-collapse.js
  35. +2 −2 js/bootstrap-dropdown.js
  36. +2 −2 js/bootstrap-modal.js
  37. +1 −1 js/bootstrap-popover.js
  38. +1 −1 js/bootstrap-scrollspy.js
  39. +1 −1 js/bootstrap-tab.js
  40. +10 −2 js/bootstrap-tooltip.js
  41. +1 −1 js/bootstrap-transition.js
  42. +1 −1 js/bootstrap-typeahead.js
  43. +17 −0 js/tests/unit/bootstrap-modal.js
  44. +1 −1 lib/bootstrap.scss
  45. +1 −1 lib/responsive.scss
  46. +1 −1 package.json
View
@@ -1,3 +1,13 @@
+## 2.3.1 (February 28, 2013)
+
+Patch release for @fat's n00bery
+
+- fix missing event type in dropdown
+- fix delegated data-attrs for popover/tooltip
+- make carousel actually pause when you click cycle
+- fix jshint ref in makefile
+- fix trying to remove backdrop when no backdrop
+
## 2.3.0 (February 7, 2013)
Minor release to add carousel indicators, improve tooltips, improve dev setup, and fix hella bugs.
View
352 LICENSE

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -15,8 +15,8 @@ build:
@echo "\n${HR}"
@echo "Building Bootstrap..."
@echo "${HR}\n"
- @jshint js/*.js --config js/.jshintrc
- @jshint js/tests/unit/*.js --config js/.jshintrc
+ @./node_modules/.bin/jshint js/*.js --config js/.jshintrc
+ @./node_modules/.bin/jshint js/tests/unit/*.js --config js/.jshintrc
@echo "Running JSHint on javascript... ${CHECK} Done"
@./node_modules/.bin/recess --compile ${BOOTSTRAP_LESS} > ${BOOTSTRAP}
@./node_modules/.bin/recess --compile ${BOOTSTRAP_RESPONSIVE_LESS} > ${BOOTSTRAP_RESPONSIVE}
@@ -28,7 +28,7 @@ build:
@echo "Compiling documentation... ${CHECK} Done"
@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
@./node_modules/.bin/uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
- @echo "/**\n* Bootstrap.js v2.3.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
+ @echo "/**\n* Bootstrap.js v2.3.1 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
@echo "Compiling and minifying javascript... ${CHECK} Done"
View
@@ -2,7 +2,7 @@
<img src="http://twitter.github.com/bootstrap/assets/img/bootstrap-docs-readme.png" width="100px">
</a>
-# [Bootstrap v2.3.0](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
+# [Bootstrap v2.3.1](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
@@ -26,7 +26,7 @@ You can use the SASS Twitter Bootstrap by dropping the compiled CSS into any new
Because SASS always outputs standard css, just link to the final output like normal:
-`<link rel="stylesheet" type="text/css" href="bootstrap-2.3.0.css">`
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.3.1.css">`
For more info, refer to the docs!
@@ -38,7 +38,7 @@ You can learn more about SASS at:
[sass-lang.com](http://sass-lang.com)
-SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.3.0.css`
+SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.3.1.css`
@@ -90,26 +90,27 @@ This is a convenience method for watching your Sass files and automatically buil
-## Developers
+## Compiling CSS and JavaScript
-We have included a makefile with convenience methods for working with the Bootstrap library.
-
-+ **dependencies**
-Our makefile depends on you having recess, connect, uglify.js, and jshint installed. To install, just run the following command in npm:
+Bootstrap includes a [makefile](Makefile) with convenient methods for working with the framework. Before getting started, be sure to install [the necessary local dependencies](package.json):
```
-$ npm install recess connect uglify-js jshint -g
+$ npm install
```
-+ **build** - `make`
-Runs the recess compiler to rebuild the `/less` files and compiles the docs pages. Requires recess and uglify-js. <a href="http://twitter.github.com/bootstrap/extend.html#compiling">Read more in our docs &raquo;</a>
+When completed, you'll be able to run the various make commands provided:
+
+#### build - `make`
+Runs the recess compiler to rebuild the `/less` files and compiles the docs. Requires recess and uglify-js.
-+ **test** - `make test`
+#### test - `make test`
Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). Depends on having phantomjs installed.
-+ **watch** - `make watch`
+#### watch - `make watch`
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
+Should you encounter problems with installing dependencies or running the makefile commands, be sure to first uninstall any previous versions (global and local) you may have installed, and then rerun `npm install`.
+
## Contributing
View
@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
end
require 'rake'
-VERSION = "2.3.0"
+VERSION = "2.3.1"
BOOTSTRAP_CSS = "bootstrap-#{VERSION}.css"
BOOTSTRAP_MIN_CSS = "bootstrap-#{VERSION}.min.css"
BOOTSTRAP_RESPONSIVE_CSS = "bootstrap-responsive-#{VERSION}.css"
@@ -1,5 +1,5 @@
/*
- * Bootstrap v2.3.0
+ * Bootstrap v2.3.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,5 +1,5 @@
/*
- * Bootstrap Responsive v2.3.0
+ * Bootstrap Responsive v2.3.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -1,6 +1,6 @@
{
"name": "sass-bootstrap",
- "version": "2.3.0",
+ "version": "2.3.1",
"main": "lib/bootstrap.scss",
"dependencies": {
"jquery": "~1.8.0"
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-affix.js v2.3.0
+ * bootstrap-affix.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-alert.js v2.3.0
+ * bootstrap-alert.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-button.js v2.3.0
+ * bootstrap-button.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-carousel.js v2.3.0
+ * bootstrap-carousel.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -75,7 +75,7 @@
if (!e) this.paused = true
if (this.$element.find('.next, .prev').length && $.support.transition.end) {
this.$element.trigger($.support.transition.end)
- this.cycle()
+ this.cycle(true)
}
clearInterval(this.interval)
this.interval = null
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-collapse.js v2.3.0
+ * bootstrap-collapse.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-dropdown.js v2.3.0
+ * bootstrap-dropdown.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -158,7 +158,7 @@
$(document)
.on('click.dropdown.data-api', clearMenus)
.on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
- .on('.dropdown-menu', function (e) { e.stopPropagation() })
+ .on('click.dropdown-menu', function (e) { e.stopPropagation() })
.on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
@@ -1,5 +1,5 @@
/* =========================================================
- * bootstrap-modal.js v2.3.0
+ * bootstrap-modal.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -148,7 +148,7 @@
}
, removeBackdrop: function () {
- this.$backdrop.remove()
+ this.$backdrop && this.$backdrop.remove()
this.$backdrop = null
}
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-popover.js v2.3.0
+ * bootstrap-popover.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-scrollspy.js v2.3.0
+ * bootstrap-scrollspy.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ========================================================
- * bootstrap-tab.js v2.3.0
+ * bootstrap-tab.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-tooltip.js v2.3.0
+ * bootstrap-tooltip.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -80,7 +80,15 @@
}
, enter: function (e) {
- var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+ var defaults = $.fn[this.type].defaults
+ , options = {}
+ , self
+
+ this._options && $.each(this._options, function (key, value) {
+ if (defaults[key] != value) options[key] = value
+ }, this)
+
+ self = $(e.currentTarget)[this.type](options).data(this.type)
if (!self.options.delay || !self.options.delay.show) return self.show()
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.3.0
+ * bootstrap-transition.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-typeahead.js v2.3.0
+ * bootstrap-typeahead.js v2.3.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
Oops, something went wrong.

0 comments on commit bd54c38

Please sign in to comment.