Merge pull request #1 from Automattic/fix/button-click

Make sure that the form is only submitted via AJAX if the browser can do that.

Author: akirk

templates/footer.php

@@ -5,7 +5,7 @@ class="<?php
 	?>hide-on-<?php echo esc_attr( $instance['hide'] ); ?>"
 	data-hide-timeout="<?php echo intval( $instance['hide-timeout'] ) ; ?>"
 >
-	<form action="<?php echo esc_attr( $blog_url ); ?>" method="post">
+	<form method="post">
 		<?php wp_nonce_field( 'eucookielaw' ); ?>
 		<input type="hidden" name="eucookielaw" value="accept" />
 		<input type="hidden" name="redirect_url" value="<?php echo esc_attr( $_SERVER['REQUEST_URI'] ) ?>" />
@@ -29,13 +29,11 @@ class="<?php
 <script type="text/javascript">
 jQuery(function( $ ) {
 	var overlay = $( '#eu-cookie-law' ), initialScrollPosition, scrollFunction;
-	if ( overlay.hasClass( 'hide-on-button' ) ) {
-		overlay.find( 'input.accept' ).on( 'click', accept );
-	} else if ( overlay.hasClass( 'hide-on-scroll' ) ) {
+	overlay.find( 'form' ).on( 'submit', accept );
+	if ( overlay.hasClass( 'hide-on-scroll' ) ) {
 		initialScrollPosition = $( window ).scrollTop();
 		scrollFunction = function() {
 			if ( Math.abs( $( window ).scrollTop() - initialScrollPosition ) > 50 ) {
-				console.log($( window ).scrollTop() - initialScrollPosition);
 				accept();
 			}
 		};
@@ -45,18 +43,22 @@ class="<?php
 	}
 
 	var accepted = false;
-	function accept() {
+	function accept( event ) {
 		if ( accepted ) {
 			return;
 		}
 		accepted = true;
 
+		if ( event && event.preventDefault ) {
+			event.preventDefault();
+		}
+
 		if ( overlay.hasClass( 'hide-on-scroll' ) ) {
 			$( window ).off( 'scroll', scrollFunction );
 		}
 
 		var expireTime = new Date();
-		expireTime.setTime( expireTime.getTime() + <?php echo $cookie_validity; ?> ); // 30 days
+		expireTime.setTime( expireTime.getTime() + <?php echo $cookie_validity; ?> );
 
 		document.cookie = '<?php echo $cookie_name; ?>=' + expireTime.getTime() + ';path=/;expires=' + expireTime.toGMTString();