root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9,459 Commits 106 Branches 92 Tags 672 MiB
Commit Graph

56 Commits

Author SHA1 Message Date
Chris Rebert c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
fat 2b302f69ee some changes from #13801 - add strict mode back and == 2014-06-12 11:11:04 -07:00
Heinrich Fenkart e9d6756a1a Fix regression of #10038 introduced by #13772 2014-06-12 06:00:02 +02:00
fat 571fd32bce fix #13220 Scrollspy generates wrong offsets for a page-- recalculate offsets if `scrollheight` changes 2014-06-10 17:38:42 -07:00
Katie Zhu 1c6fa9010d MD/CommonJS/Globals #12909 2014-06-10 17:16:29 -07:00
Jacob fe74a8bb3e Merge pull request #13755 from twbs/fat-visual-test 
Adds isolated visual tests for javascript plugins (decoupled from docs)....
 2014-06-08 16:05:08 -07:00
fat 91103e6d1f Adds isolated visual tests for javascript plugins (decoupled from docs). This makes it 
faster and easier to test/develop js functionality not represented in unit tests, and gives us
a playground for interactions, etc.

It also makes it so developing javascript is now decoupled form jekyll, which should make everything
faster and less painful.

This commit also reverts my filter commit 9900771aa7
which broke scrollspy for dropdowns.
 2014-06-07 19:11:44 -07:00
Mike Greiling 1cfa902e31 refactor scrollspy refresh method 
Closes #13702 by merging a rebased version of it.
 2014-06-07 18:26:39 -07:00
Mike Greiling bc8e6ffb7d removing this.$element as it is a superfluous copy of this.$scrollElement 2014-06-07 18:09:53 -07:00
Mike Greiling 632313d631 no need to check for href attribute on the scrollable element 2014-06-07 18:09:53 -07:00
Mike Greiling 0be4109688 there is no need for this.offsets and this.targets to be jQuery objects 2014-06-07 18:09:53 -07:00
XhmikosR 7b0acf14d8 Comply to the new style. 2014-06-06 01:23:07 +03:00
Mike Robinet e84b0c0433 Adjust for Scrollspy offset when calculating maxScroll. 2014-05-13 09:57:04 -05:00
fat f219fee07b versions 2014-05-12 21:15:16 -07:00
fat 9900771aa7 fixes #12211: Scrollspy: Navs in different tabs can interfere with each othe 2014-05-12 19:15:23 -07:00
Collin Donahue-Oponski a9f2b6ce0f #11464 - Fix JS noConflict mode - Refactor all plugins to use an internal reference to the jQuery plugin, because in noConflict mode you can never expect to be defined on the jQuery object 2014-04-21 23:03:33 -06:00
XhmikosR 45b476bdbf JS: remove unused variables. 2014-04-09 10:01:48 +03:00
Tobias Lindig 0f366e0376 correct event naming of `scroll` and `load' event 
closes #12337
 2014-03-16 19:58:12 -07:00
Jacob 905c78129f Merge pull request #11937 from IHomer/master 
Fix: IE10 or lower incorrectly determines the scrollheight of the body. ...
 2014-03-13 21:45:04 -07:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Chris Rebert 5f328dce88 Merge pull request #12057 from ZDroid/nl 
'use strict' on new line
 2014-01-07 00:31:27 -08:00
Julian Thilo 7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Zlatan Vasović 0f060e7bc4 'use strict' on new line 2014-01-01 15:42:41 +01:00
Zlatan Vasović 1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
fat 162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top 
Conflicts:
	dist/js/bootstrap.min.js
 2013-12-29 18:04:43 -08:00
Jacob ea40e7999d Merge pull request #11203 from jasny/patch-1 
Scrollspy acting up when targets are hidden
 2013-12-28 22:06:26 -08:00
fat fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
Mark Otto 5c2dfbf33b Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	docs-assets/js/raw-files.js
 2013-12-24 12:17:48 -08:00
Mark Otto 679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
fat a87b150bc7 fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class 2013-12-23 22:08:43 -08:00
Zlatan Vasović 1bf5abab31 No leading pluses 2013-12-19 15:32:37 +01:00
joep.joosten@ihomer.nl 1ceab8b89f Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used. 2013-12-19 12:41:33 +01:00
joep.joosten@ihomer.nl 3bcb1cc255 Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used. 2013-12-19 12:18:51 +01:00
Chris Rebert df3716647d update licensing header in JS files & run grunt 2013-12-18 15:29:19 -08:00
Mark Otto e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
XhmikosR eca8ff3803 Use single quotes consistently. 2013-12-08 12:44:14 +02:00
Mark Otto 8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
fat 7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Ziogas ed5dbf1b2b Update affix properly on scrollspy speedy scroll to top of page #11310 
Fix scrollspy.js so as affix is updated properly when user scrolls fast
to top of page.

A fix for issue #11310.
 2013-11-07 16:39:57 +02:00
Mark Otto 6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Chris Rebert f1b0cd491c Merge pull request #10039 from daguej/js-refs 
Don't explicitly reference global jQuery
 2013-11-05 16:55:55 -08:00
Chris Rebert 4e0d022de5 update version numbers in JS file comment headers to v3.0.1 & regrunt 2013-11-01 17:15:34 -07:00
Jared Christensen 583697fec3 JS comments pointed to new documentation 2013-10-29 12:10:47 -05:00
Zlatan Vasović 63433fbef9 Update license year 2013-10-22 18:41:33 +02:00
Arnold Daniels 5a38a5775f Scrollspy acting up when targets are hidden 
If elements are hidden using `display: none;` which are targets mapped by scrollspy, the plugin might select an incorrect or no menu item.

Checking if the target is visible solved this.
 2013-10-22 13:31:23 +02:00
Josh Dague f140084f2b Don't explicitly reference global jQuery 
Removes `window.jQuery` in favor of `jQuery`, fixes #10038
 2013-08-22 14:50:15 -04:00
fat cfa4ab90f3 fix scrollspy for window *and* children 2013-07-26 22:24:51 -07:00
Jacob f1ddf7681c Merge pull request #8419 from hollensteiner/3.0.0-wip 
Replace position() with offset() in scrollspy.js
 2013-07-25 21:19:57 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00