diff options
| author | Mark Tareshawty <[email protected]> | 2015-04-15 20:19:27 -0400 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-04-16 17:17:28 -0700 |
| commit | 229e88892913d5c8b712510c28b78bfa114596e5 (patch) | |
| tree | 416fd3187c238b3891adfd2e9c097b82d716dda4 /docs/assets/js/src | |
| parent | 21e94b037480c13380ea5d587947f98807c64dbf (diff) | |
| download | bootstrap-229e88892913d5c8b712510c28b78bfa114596e5.tar.xz bootstrap-229e88892913d5c8b712510c28b78bfa114596e5.zip | |
Update ZeroClipboard and remove Copy buttons when Flash is unavailable
Fixes #16269.
Closes #16301 by merging a rebased version of it.
Diffstat (limited to 'docs/assets/js/src')
| -rw-r--r-- | docs/assets/js/src/application.js | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js index 161f3d002..7d9b226bc 100644 --- a/docs/assets/js/src/application.js +++ b/docs/assets/js/src/application.js @@ -127,7 +127,7 @@ // Config ZeroClipboard ZeroClipboard.config({ - moviePath: '/assets/flash/ZeroClipboard.swf', + swfPath: '/assets/flash/ZeroClipboard.swf', hoverClass: 'btn-clipboard-hover' }) @@ -136,39 +136,38 @@ var btnHtml = '<div class="zero-clipboard"><span class="btn-clipboard">Copy</span></div>' $(this).before(btnHtml) }) + var zeroClipboard = new ZeroClipboard($('.btn-clipboard')) var htmlBridge = $('#global-zeroclipboard-html-bridge') // Handlers for ZeroClipboard - zeroClipboard.on('load', function () { + zeroClipboard.on('ready', function () { htmlBridge .data('placement', 'top') .attr('title', 'Copy to clipboard') .tooltip() - }) - // Copy to clipboard - zeroClipboard.on('dataRequested', function (client) { - var highlight = $(this).parent().nextAll('.highlight').first() - client.setText(highlight.text()) - }) + // Copy to clipboard + zeroClipboard.on('copy', function (event) { + var highlight = $(event.target).parent().nextAll('.highlight').first() + event.clipboardData.setData('text/plain', highlight.text()) + }) - // Notify copy success and reset tooltip title - zeroClipboard.on('complete', function () { - htmlBridge - .attr('title', 'Copied!') - .tooltip('fixTitle') - .tooltip('show') - .attr('title', 'Copy to clipboard') - .tooltip('fixTitle') + // Notify copy success and reset tooltip title + zeroClipboard.on('aftercopy', function () { + htmlBridge + .attr('title', 'Copied!') + .tooltip('fixTitle') + .tooltip('show') + .attr('title', 'Copy to clipboard') + .tooltip('fixTitle') + }) }) - // Notify copy failure - zeroClipboard.on('noflash wrongflash', function () { - htmlBridge - .attr('title', 'Flash required') - .tooltip('fixTitle') - .tooltip('show') + // Hide copy button on error + zeroClipboard.on('error', function () { + $('.zero-clipboard').remove() + ZeroClipboard.destroy() }) }) |
