Merge branch 'master' of https://github.com/twbs/bootstrap into list_group_buttons

1 files changed, 23 insertions, 24 deletions

diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js
index 161f3d002..8aff80afd 100644
--- a/docs/assets/js/src/application.js
+++ b/docs/assets/js/src/application.js
@@ -4,7 +4,7 @@
 
 /*!
  * JavaScript for Bootstrap's docs (http://getbootstrap.com)
- * Copyright 2011-2014 Twitter, Inc.
+ * Copyright 2011-2015 Twitter, Inc.
  * Licensed under the Creative Commons Attribution 3.0 Unported License. For
  * details, see http://creativecommons.org/licenses/by/3.0/.
  */
@@ -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()
     })
 
   })
@@ -177,5 +176,5 @@
 
 ;(function () {
   'use strict';
-  addAnchors('.bs-docs-container h1, .bs-docs-container h2, .bs-docs-container h3, .bs-docs-container h4, .bs-docs-container h5');
+  addAnchors('.bs-docs-container > h1, .bs-docs-container > h2, .bs-docs-container > h3, .bs-docs-container > h4, .bs-docs-container > h5');
 })();