diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-07 15:16:45 +0300 |
| commit | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (patch) | |
| tree | f11fa18c33d1a65ae4422dc3c352c34a2b323b8c /docs/assets/js/bootstrap.js | |
| parent | 41c782567775d3bbcfc62d163ae22a531277b5e2 (diff) | |
| parent | b352f98f325adbd994f01cb94f4d0a454783bbce (diff) | |
| download | bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.tar.xz bootstrap-3c7a43a1f373d0c534476578b96a75ae2e63c985.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/tests/unit/bootstrap-collapse.js
Diffstat (limited to 'docs/assets/js/bootstrap.js')
| -rw-r--r-- | docs/assets/js/bootstrap.js | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 57ec04196..8de108627 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -57,7 +57,8 @@ }) -}(window.jQuery);/* ========================================================== +}(window.jQuery); +/* ========================================================== * bootstrap-alert.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#alerts * ========================================================== @@ -155,7 +156,8 @@ $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) -}(window.jQuery);/* ============================================================ +}(window.jQuery); +/* ============================================================ * bootstrap-button.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#buttons * ============================================================ @@ -259,7 +261,8 @@ $btn.button('toggle') }) -}(window.jQuery);/* ========================================================== +}(window.jQuery); +/* ========================================================== * bootstrap-carousel.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#carousel * ========================================================== @@ -465,7 +468,8 @@ e.preventDefault() }) -}(window.jQuery);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-collapse.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#collapse * ============================================================= @@ -631,7 +635,8 @@ $(target).collapse(option) }) -}(window.jQuery);/* ============================================================ +}(window.jQuery); +/* ============================================================ * bootstrap-dropdown.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#dropdowns * ============================================================ @@ -1621,7 +1626,7 @@ this.activeTarget = target $(this.selector) - .parent('.active') + .parents('.active') .removeClass('active') selector = this.selector @@ -1629,7 +1634,7 @@ + this.selector + '[href="' + target + '"]' active = $(selector) - .parent('li') + .parents('li') .addClass('active') if (active.parent('.dropdown-menu').length) { @@ -1683,7 +1688,8 @@ }) }) -}(window.jQuery);/* ======================================================== +}(window.jQuery); +/* ======================================================== * bootstrap-tab.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#tabs * ======================================================== @@ -1826,7 +1832,8 @@ $(this).tab('show') }) -}(window.jQuery);/* ============================================================= +}(window.jQuery); +/* ============================================================= * bootstrap-typeahead.js v3.0.0 * http://twitter.github.com/bootstrap/javascript.html#typeahead * ============================================================= @@ -2277,4 +2284,4 @@ }) -}(window.jQuery);
\ No newline at end of file +}(window.jQuery); |