diff options
| author | Pierre-Denis Vanduynslager <[email protected]> | 2016-12-28 19:57:38 -0500 |
|---|---|---|
| committer | Pierre-Denis Vanduynslager <[email protected]> | 2016-12-28 19:57:38 -0500 |
| commit | 425d156df27fa6c18e979aa000bfe5a346ee3450 (patch) | |
| tree | 4157dfcbdf8334e9d9fb2bb239f4ae78706bbc71 /docs/assets/js/src | |
| parent | ab2fc63d08b8c53d6f29bcfd73b7f2d5ceaacacd (diff) | |
| parent | e1e621be046a4541a2fd36e445015ee44de3c67e (diff) | |
| download | bootstrap-425d156df27fa6c18e979aa000bfe5a346ee3450.tar.xz bootstrap-425d156df27fa6c18e979aa000bfe5a346ee3450.zip | |
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'docs/assets/js/src')
| -rw-r--r-- | docs/assets/js/src/application.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js index f45add540..529b0c1b8 100644 --- a/docs/assets/js/src/application.js +++ b/docs/assets/js/src/application.js @@ -3,7 +3,7 @@ // ++++++++++++++++++++++++++++++++++++++++++ /*! - * JavaScript for Bootstrap's docs (http://getbootstrap.com) + * JavaScript for Bootstrap's docs (https://getbootstrap.com) * Copyright 2011-2016 The Bootstrap Authors * Copyright 2011-2016 Twitter, Inc. * Licensed under the Creative Commons Attribution 3.0 Unported License. For @@ -33,7 +33,7 @@ $('.bd-example-indeterminate [type="checkbox"]').prop('indeterminate', true) // Disable empty links in docs examples - $('.bd-example [href=#]').click(function (e) { + $('.bd-content [href="#"]').click(function (e) { e.preventDefault() }) @@ -73,7 +73,8 @@ }) clipboard.on('error', function (e) { - var fallbackMsg = /Mac/i.test(navigator.userAgent) ? 'Press \u2318 to copy' : 'Press Ctrl-C to copy' + var modifierKey = /Mac/i.test(navigator.userAgent) ? '\u2318' : 'Ctrl-' + var fallbackMsg = 'Press ' + modifierKey + 'C to copy' $(e.trigger) .attr('title', fallbackMsg) |