change zeroclipboard to clipboardjs

goodot · Mar 22, 2016 · 1003a6c · 1003a6c
1 parent fe18186
commit 1003a6c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 26 deletions.
diff --git a/includes/functions-html.php b/includes/functions-html.php
@@ -107,7 +107,7 @@ function yourls_html_head( $context = 'index', $title = '' ) {
 	<?php if ( $share ) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/share.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
 		<script src="<?php yourls_site_url(); ?>/js/share.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
-		<script src="<?php yourls_site_url(); ?>/js/jquery.zclip.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
+		<script src="<?php yourls_site_url(); ?>/js/clipboard.min.js?v=<?php echo YOURLS_VERSION; ?>" type="text/javascript"></script>
 	<?php } ?>
 	<?php if ( $cal ) { ?>
 		<link rel="stylesheet" href="<?php yourls_site_url(); ?>/css/cal.css?v=<?php echo YOURLS_VERSION; ?>" type="text/css" media="screen" />
@@ -123,7 +123,6 @@ function yourls_html_head( $context = 'index', $title = '' ) {
 	<script type="text/javascript">
 	//<![CDATA[
 		var ajaxurl  = '<?php echo yourls_admin_url( 'admin-ajax.php' ); ?>';
-		var zclipurl = '<?php yourls_site_url(); ?>/js/ZeroClipboard.swf';
 	//]]>
 	</script>
 	<?php yourls_do_action( 'html_head', $context ); ?>

diff --git a/js/ZeroClipboard.swf b/js/ZeroClipboard.swf
diff --git a/js/clipboard.min.js b/js/clipboard.min.js
diff --git a/js/jquery.zclip.min.js b/js/jquery.zclip.min.js
diff --git a/js/share.js b/js/share.js
@@ -36,16 +36,14 @@ function share(dest) {
 }
 
 function init_clipboard() {
-	$('#copylink').click(function(){
-		$(this).select();
-	})
-
-	$('#copylink').zclip({
-		path: zclipurl,
-		copy: $('#copylink').val(),
-		afterCopy:function(){
-			html_pulse( '#copybox h2, #copybox h3', 'Copied!' );
-		}
-	});
-};                     
 
+    var clipboard = new Clipboard('#copylink', {
+        text: function (trigger) {
+            return $(trigger).select();
+        }
+    });
+
+    clipboard.on('success', function (e) {
+        html_pulse('#copybox h2, #copybox h3', 'Copied!');
+    });
+};