Merge pull request #2066 from Preovaleo/master

Change zeroclipboard to clipboardjs. Goodbye flash. Fixes #2047
YOURLS · May 19, 2016 · b38215e · b38215e
2 parents c830f72 + eb399a0
commit b38215e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,6 @@ Desktop.ini
 
 # Mac crap
 .DS_Store
+
+# NetBeans files
+/nbproject/
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(){
+    var clipboard = new Clipboard('#copylink', {
-		$(this).select();
+        text: function (trigger) {
-	})
+            return $(trigger).val();
-
+        }
-	$('#copylink').zclip({
+    });
-		path: zclipurl,
+
-		copy: $('#copylink').val(),
+    clipboard.on('success', function () {
-		afterCopy:function(){
+        $('#copylink').select();
-			html_pulse( '#copybox h2, #copybox h3', 'Copied!' );
+        html_pulse('#copybox h2, #copybox h3', 'Copied!');
-		}
+    });
-	});
+};
-};                     
-
diff --git a/sample-public-front-page.txt b/sample-public-front-page.txt
@@ -65,7 +65,7 @@ if ( isset( $_REQUEST['url'] ) && $_REQUEST['url'] != 'http://' ) {
 		// Include the Copy box and the Quick Share box
 		yourls_share_box( $url, $shorturl, $title, $text );
 
-		// Initialize clipboard -- requires js/share.js and js/jquery.zclip.min.js to be properly loaded in the <head>
+		// Initialize clipboard -- requires js/share.js and js/clipboard.min.js to be properly loaded in the <head>
 		echo "<script>init_clipboard();</script>\n";
 	}