From f140084f2beb17b0a266b42ab9a03d0b935e5f66 Mon Sep 17 00:00:00 2001 From: Josh Dague Date: Thu, 22 Aug 2013 14:50:15 -0400 Subject: [PATCH 01/94] Don't explicitly reference global jQuery Removes `window.jQuery` in favor of `jQuery`, fixes #10038 --- js/affix.js | 2 +- js/alert.js | 2 +- js/button.js | 2 +- js/carousel.js | 2 +- js/collapse.js | 2 +- js/dropdown.js | 2 +- js/modal.js | 2 +- js/popover.js | 2 +- js/scrollspy.js | 2 +- js/tab.js | 2 +- js/tooltip.js | 2 +- js/transition.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/js/affix.js b/js/affix.js index c7be96e1dd..7ab1479c34 100644 --- a/js/affix.js +++ b/js/affix.js @@ -123,4 +123,4 @@ }) }) -}(window.jQuery); +}(jQuery); diff --git a/js/alert.js b/js/alert.js index 663029ed8e..df04b7e5e9 100644 --- a/js/alert.js +++ b/js/alert.js @@ -95,4 +95,4 @@ $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) -}(window.jQuery); +}(jQuery); diff --git a/js/button.js b/js/button.js index fc73b555fd..68c211b578 100644 --- a/js/button.js +++ b/js/button.js @@ -106,4 +106,4 @@ e.preventDefault() }) -}(window.jQuery); +}(jQuery); diff --git a/js/carousel.js b/js/carousel.js index d8c4c243ca..b633cfb9f3 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -214,4 +214,4 @@ }) }) -}(window.jQuery); +}(jQuery); diff --git a/js/collapse.js b/js/collapse.js index 92cc0bc76f..2e0d4290cf 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -176,4 +176,4 @@ $target.collapse(option) }) -}(window.jQuery); +}(jQuery); diff --git a/js/dropdown.js b/js/dropdown.js index 6093f11a87..9293b830bf 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -151,4 +151,4 @@ .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) -}(window.jQuery); +}(jQuery); diff --git a/js/modal.js b/js/modal.js index 65eba481e5..0107f22d03 100644 --- a/js/modal.js +++ b/js/modal.js @@ -243,4 +243,4 @@ .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') }) .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') }) -}(window.jQuery); +}(jQuery); diff --git a/js/popover.js b/js/popover.js index ecd37ac233..12ad7f9934 100644 --- a/js/popover.js +++ b/js/popover.js @@ -114,4 +114,4 @@ return this } -}(window.jQuery); +}(jQuery); diff --git a/js/scrollspy.js b/js/scrollspy.js index 10f95f249a..1094481cc9 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -155,4 +155,4 @@ }) }) -}(window.jQuery); +}(jQuery); diff --git a/js/tab.js b/js/tab.js index e1c155920f..9b2de8b441 100644 --- a/js/tab.js +++ b/js/tab.js @@ -132,4 +132,4 @@ $(this).tab('show') }) -}(window.jQuery); +}(jQuery); diff --git a/js/tooltip.js b/js/tooltip.js index 89802287a3..67806c56ef 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -383,4 +383,4 @@ return this } -}(window.jQuery); +}(jQuery); diff --git a/js/transition.js b/js/transition.js index e8f318beb7..36ca6f8943 100644 --- a/js/transition.js +++ b/js/transition.js @@ -53,4 +53,4 @@ $.support.transition = transitionEnd() }) -}(window.jQuery); +}(jQuery); From 9d2491a808a887f604c4ba091b6a1b7fc6f937b6 Mon Sep 17 00:00:00 2001 From: Rodrigo Willrich Date: Sun, 1 Sep 2013 16:24:42 -0300 Subject: [PATCH 02/94] Bower: Ignore development and documentation files on bower.json. Fix #10313. I've kept only the files I consider relevant to bower installation: - Files in dist directory; - Files in js directory; - Files in less directory; - bower.json file; - README.md file; - LICENSE file. --- bower.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 0d03da6c90..91d667c114 100644 --- a/bower.json +++ b/bower.json @@ -3,7 +3,19 @@ "version": "3.0.0", "main": ["./dist/js/bootstrap.js", "./dist/css/bootstrap.css", "./dist/fonts/*"], "ignore": [ - "**/.*" + "**/.*", + "_*", + "assets", + "examples", + "/fonts", + "js/tests", + "CNAME", + "CONTRIBUTING.md", + "Gruntfile.js", + "browserstack.json", + "composer.json", + "package.json", + "*.html" ], "dependencies": { "jquery": ">= 1.9.0" From f32abbb6e18b8be2fb35df06ed19b4dc7c6e0f7b Mon Sep 17 00:00:00 2001 From: Rodrigo Willrich Date: Fri, 27 Sep 2013 09:04:33 -0300 Subject: [PATCH 03/94] bower.json: Modify `assets` directory on ignore to `docs-assets` --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 91d667c114..813ab8ee0d 100644 --- a/bower.json +++ b/bower.json @@ -5,7 +5,7 @@ "ignore": [ "**/.*", "_*", - "assets", + "docs-assets", "examples", "/fonts", "js/tests", From 15f15cafd6624724c05b31933f6ec0a096b9766e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rog=C3=A9rio=20Yokomizo?= Date: Sat, 19 Oct 2013 01:07:10 -0300 Subject: [PATCH 04/94] added bower_components to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 10c58cf685..465cdb4633 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ validation-report.json # Folders to ignore node_modules +bower_components From 0d4b9ef72e7e8e7210523aced9aced2d8cbad74a Mon Sep 17 00:00:00 2001 From: AJ Acevedo Date: Thu, 31 Oct 2013 16:09:41 -0400 Subject: [PATCH 05/94] Added navigation role to example navbars As per the docs: http://getbootstrap.com/components/#navbar-default modified: examples/carousel/index.html modified: examples/jumbotron/index.html modified: examples/navbar-fixed-top/index.html modified: examples/navbar-static-top/index.html modified: examples/navbar/index.html modified: examples/non-responsive/index.html modified: examples/starter-template/index.html modified: examples/sticky-footer-navbar/index.html modified: examples/theme/index.html --- examples/carousel/index.html | 2 +- examples/jumbotron/index.html | 2 +- examples/navbar-fixed-top/index.html | 2 +- examples/navbar-static-top/index.html | 2 +- examples/navbar/index.html | 2 +- examples/non-responsive/index.html | 2 +- examples/starter-template/index.html | 2 +- examples/sticky-footer-navbar/index.html | 2 +- examples/theme/index.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 14674eebc6..00610346fd 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -31,7 +31,7 @@
-
+