root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
9,545 Commits 125 Branches 94 Tags 690 MiB
Commit Graph

43 Commits

Author SHA1 Message Date
Wing 48b822db40 trigger 'affixed.bs.affix' instead of 'affixed' 
Original is triggering `affixed` not `affixed.bs.affix`, only `.on('affixed.bs.affix', ...)` also catch `affixed` event.

Closes #13998.
 2014-07-03 10:52:22 -07:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
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
Katie Zhu 1c6fa9010d MD/CommonJS/Globals #12909 2014-06-10 17:16:29 -07:00
XhmikosR e2cabe4971 Minor style tweaks. 2014-06-06 01:23:07 +03:00
Attila Dobi f47ad79538 add `target` option to Affix plugin 2014-05-16 13:07:45 -07:00
fat f219fee07b versions 2014-05-12 21:15:16 -07:00
Gregory Pakosz 78cac11cef Fixed affix-bottom positioning 
Set top position to (scrollHeight - this.$element.height() - offsetBottom).
 2014-05-09 00:26:31 +02: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
Jacob fa4379de08 Merge pull request #12862 from sultano/patch-1 
Fixed flickering and simplified calculations
 2014-03-16 20:24:21 -07:00
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Suleman Chikhalia f7c360d620 Fixed flickering and simplified calculations 
- Removed offending line causing a flicker to the default top state
- Simplified calculation of the top offset when in the bottom state
 2014-02-27 00:39:46 -08: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
Jacob 0fab6e7ea7 Merge pull request #11722 from DocX/patch-1 
Use document scroll height instead of offset height
 2013-12-24 16:43:24 -08:00
fat c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -08:00
Jacob 139b395dfb Merge pull request #10359 from ixti/patch-1 
Pass $element to offset top/bottom calc funcs
 2013-12-24 13:21:19 -08:00
fat 558b6a478d Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	dist/js/bootstrap.min.js
	docs-assets/js/raw-files.js
 2013-12-24 12:35:24 -08:00
fat 50bd4edb8c fixes #10236 
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
 2013-12-24 12:32:06 -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
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
Lukáš Doležal 6e9efb2024 Use document scroll height instead of offset height to support body with absolute height 2013-12-05 16:28:31 +01:00
Mark Otto 8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08: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
Aleksey V. Zapparov 626cef9fa4 Pass $element to offset top/bottom calc funcs 
At the moment to make dynamic top offset calculator on multiple elements, one would write:

``` javascript
$('.my-affix').each(function () {
  var $el = $(this);
  $el.affix({
    offset: {
      top: function () { return $el.offset().top; }
    }
  });
})
```

This patch will allow to:

``` javascript
$('.my-affix').affix({
  offset: {
    top: function ($el) { return $el.offset().top; }
  }
});
```
 2013-09-02 03:24:27 +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 f5f04ae4a0 fix affix… 2013-07-25 23:30:13 -07:00
Chris Rebert 90fb40b707 twbs ALL the links 2013-07-25 12:24:13 -07:00
Jacob Thornton ccfa989898 upgrade jshint to 2.1.2 for anton <3 2013-05-21 19:31:51 -07:00
fat 140ef2320b change namespace back to dot notation and someother js shizzle 2013-05-16 20:19:51 -07:00
fat 14651035de a bunch javascript junk 2013-05-16 11:06:30 -07:00