diff options
| author | Jacob Thornton <[email protected]> | 2012-04-24 02:21:45 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-24 02:21:45 -0700 |
| commit | e659dc7e1be2e09cec34703dce8c737496e3504e (patch) | |
| tree | be3caed12a3de1218e1fd548f2564302e6c8193a /docs/assets/js/application.js | |
| parent | 6506ede6323ee60d4d7f8171937d92141a64e09e (diff) | |
| parent | 839ef3a030b355d0f0c35d6c9e42ecba8b072036 (diff) | |
| download | bootstrap-e659dc7e1be2e09cec34703dce8c737496e3504e.tar.xz bootstrap-e659dc7e1be2e09cec34703dce8c737496e3504e.zip | |
Merge branch '2.0.3-wip'
Conflicts:
Makefile
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
Diffstat (limited to 'docs/assets/js/application.js')
| -rw-r--r-- | docs/assets/js/application.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 732bed458..6463b902f 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -51,6 +51,11 @@ processScroll() + // hack sad times - holdover until rewrite for 2.1 + $nav.on('click', function () { + if (!isFixed) setTimeout(function () { $win.scrollTop($win.scrollTop() - 47) }, 10) + }) + $win.on('scroll', processScroll) function processScroll() { @@ -132,7 +137,7 @@ $.ajax({ type: 'POST' - , url: 'http://bootstrap.herokuapp.com' + , url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap.herokuapp.com' , dataType: 'jsonpi' , params: { js: js @@ -142,7 +147,6 @@ } }) }) - }) // Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi |