Deploying version 1.2

README.md

@@ -1,9 +1,9 @@
 # WP Offload S3 Lite #
 **Contributors:** bradt, deliciousbrains  
 **Tags:** uploads, amazon, s3, amazon s3, mirror, admin, media, cdn, cloudfront  
-**Requires at least:** 4.4  
-**Tested up to:** 4.7.3  
-**Stable tag:** 1.1.6  
+**Requires at least:** 4.6  
+**Tested up to:** 4.8  
+**Stable tag:** 1.2  
 **License:** GPLv3  
 
 Copies files to Amazon S3 as they are uploaded to the Media Library. Optionally configure Amazon CloudFront for faster delivery.
@@ -22,12 +22,12 @@ If you're adding this plugin to a site that's been around for a while, your exis
 
 * Upload existing Media Library to Amazon S3
 * Control Amazon S3 files from the Media Library
-* [Assets addon](https://deliciousbrains.com/wp-offload-s3/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=os3-free-plugin#assets-addon) - Serve your CSS & JS from Amazon S3/CloudFront
-* [WooCommerce addon](https://deliciousbrains.com/wp-offload-s3/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=os3-free-plugin#woocommerce-addon)
-* [Easy Digital Downloads addon](https://deliciousbrains.com/wp-offload-s3/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=os3-free-plugin#edd-addon)
+* [Assets addon](https://deliciousbrains.com/wp-offload-s3/?utm_campaign=WP%2BOffload%2BS3&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting&utm_content=assets%2Baddon#addons) - Serve your CSS & JS from Amazon S3/CloudFront
+* [WooCommerce addon](https://deliciousbrains.com/wp-offload-s3/?utm_campaign=WP%2BOffload%2BS3&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting&utm_content=woocommerce%2Baddon#addons)
+* [Easy Digital Downloads addon](https://deliciousbrains.com/wp-offload-s3/?utm_campaign=WP%2BOffload%2BS3&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting&utm_content=edd%2Baddon#addons)
 * PriorityExpert™ email support
 
-[Compare pro vs free →](http://deliciousbrains.com/wp-offload-s3/upgrade/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=os3-free-plugin)
+[Compare pro vs free →](https://deliciousbrains.com/wp-offload-s3/upgrade/?utm_campaign=WP%2BOffload%2BS3&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting)
 
 The video below runs through the pro upgrade features...
 
@@ -48,7 +48,7 @@ which is a fork of [Amazon S3 for WordPress](http://wordpress.org/extend/plugins
 
 ### What are the minimum requirements? ###
 
-You can see the minimum requirements [here](https://deliciousbrains.com/wp-offload-s3/pricing/?utm_source=wordpress.org&utm_medium=web&utm_content=desc&utm_campaign=os3-free-plugin#requirements).
+You can see the minimum requirements [here](https://deliciousbrains.com/wp-offload-s3/pricing/?utm_campaign=WP%2BOffload%2BS3&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting&utm_content=requirements#requirements).
 
 ## Screenshots ##
 
@@ -69,6 +69,17 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 
 ## Changelog ##
 
+### WP Offload S3 Lite 1.2 - 2017-06-19 ###
+* New: Compatibility with WordPress 4.8
+* New: Support for WP CLI `wp media regenerate`
+* Improvement: Intermediate image sizes are now passed through the `as3cf_object_meta` filter
+* Improvement: Content filtering cache now uses the external object when available
+* Bug fix: Timeouts on large multisite installs due to excessive database queries on upgrade routines
+* Bug fix: Video files with private ACL not working with WordPress's default media player
+* Bug fix: Bucket permissions check not using configured path
+* Bug fix: WordPress image editor sometimes shows a 404 when 'Remove Files From Server' enabled
+* Bug fix: Notice: Undefined index: region
+
 ### WP Offload S3 Lite 1.1.6 - 2017-03-13 ###
 * New: Compatibility with [Advanced Custom Fields](https://wordpress.org/plugins/advanced-custom-fields/)
 * New: `as3cf_filter_post_local_to_s3` and `as3cf_filter_post_s3_to_local` filters added for filtering S3 URLs in custom content
@@ -118,7 +129,7 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 
 ### WP Offload S3 Lite 1.0.5 - 2016-09-01 ###
 * New: Compatibility with WordPress 4.6
-* Improvement: No longer delete plugin data on uninstall. Manual removal possible, as per this [doc](https://deliciousbrains.com/wp-offload-s3/doc/uninstall/)
+* Improvement: No longer delete plugin data on uninstall. Manual removal possible, as per this [doc](https://deliciousbrains.com/wp-offload-s3/doc/uninstall/?utm_campaign=changelogs&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting)
 
 ### WP Offload S3 Lite 1.0.4 - 2016-05-30 ###
 * New: Now using simpler Force HTTPS setting, removed redundant Always Use HTTP setting
@@ -224,8 +235,8 @@ This version requires PHP 5.3.3+ and the Amazon Web Services plugin
 * Bug fix: Accidentally released the sidebar for after we launch the pro version
 
 ### WP Offload S3 0.9.1 - 2015-07-29 ###
-* Improvement: Access denied sample IAM policy replaced with link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/)
-* Improvement: Access denied messages on bucket selection or bucket creation now link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/)
+* Improvement: Access denied sample IAM policy replaced with link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/?utm_campaign=changelogs&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting)
+* Improvement: Access denied messages on bucket selection or bucket creation now link to [Quick Start Guide](https://deliciousbrains.com/wp-offload-s3/doc/quick-start-guide/?utm_campaign=changelogs&utm_source=wordpress.org&utm_medium=free%2Bplugin%2Blisting)
 * Improvement: Object expires time can now be filtered using the `as3cf_object_meta` filter
 * Bug fix: Error not always shown when S3 bucket inaccessible due to incorrect permissions
 * Bug fix: Permission checks fail when S3 bucket is in a non-default region and defined by `AS3CF_BUCKET` constant

assets/js/modal.js

@@ -101,13 +101,13 @@ var as3cfModal = (function( $ ) {
 		var target = $( '#as3cf-modal' ).data( 'as3cf-modal-target' );
 
 		$( '#as3cf-overlay' ).fadeOut( 150, function() {
-			if ( 'function' === typeof callback ) {
-				callback( target );
-			}
-
 			$( 'body' ).removeClass( 'as3cf-modal-open' );
 
 			$( this ).remove();
+
+			if ( 'function' === typeof callback ) {
+				callback( target );
+			}
 		} );
 
 		$( 'body' ).trigger( 'as3cf-modal-close', [ target ] );

assets/js/script.js

@@ -459,7 +459,12 @@
 
 			setBucketLink();
 
-			as3cfModal.close( unlockBucketSelect );
+			as3cfModal.close( function() {
+				$activeTab.trigger( 'bucket-change', [ canWrite ] );
+
+				// Unlock setting the bucket
+				as3cf.buckets.bucketSelectLock = false;
+			} );
 		},
 
 		/**
@@ -623,15 +628,6 @@
 		} );
 	}
 
-	/**
-	 * Reset the bucket select lock
-	 */
-	function unlockBucketSelect( target ) {
-
-		// Unlock setting the bucket
-		as3cf.buckets.bucketSelectLock = false;
-	}
-
 	/*
 	 * Toggle the lost files notice
 	 */
@@ -654,47 +650,41 @@
 		}
 	}
 
+	/**
+	 * Update the UI with the current active tab set in the URL hash.
+	 */
+	function renderCurrentTab() {
+
+		// If rendering the default tab, or a bare hash clean the hash.
+		if ( '#' + as3cf.tabs.defaultTab === location.hash ) {
+			location.hash = '';
+
+			return;
+		}
+
+		// Strip the # if still on the end of the URL
+		if ( 'function' === typeof history.replaceState && '#' === location.href.slice( -1 ) ) {
+			history.replaceState( {}, '', location.href.slice( 0, -1 ) );
+		}
+
+		as3cf.tabs.toggle( location.hash.replace( '#', '' ), true );
+	}
+
 	$( document ).ready( function() {
 
 		// Tabs
 		// --------------------
+		renderCurrentTab();
+
+		/**
+		 * Set the hashchange callback to update the rendered active tab.
+		 */
+		window.onhashchange = renderCurrentTab;
 
 		// Move any compatibility errors below the nav tabs
 		var $navTabs = $( '.wrap.aws-main .nav-tab-wrapper' );
 		$( '.aws-compatibility-notice, div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $navTabs );
 
-		// Check for hash in url and switch tabs accordingly
-		if ( window.location.hash ) {
-			var hash = window.location.hash.substring( 1 );
-			as3cf.tabs.toggle( hash, true );
-		} else {
-
-			// Default settings tab
-			$activeTab = $( '#tab-' + as3cf.tabs.defaultTab );
-			$( '.aws-main' ).attr( 'data-tab', as3cf.tabs.defaultTab );
-		}
-
-		$( '.aws-main' ).on( 'click', '.nav-tab', function( e ) {
-			e.preventDefault();
-			if ( $( this ).hasClass( 'nav-tab-active' ) ) {
-				return;
-			}
-			var nextTab = $( this ).attr( 'data-tab' );
-			as3cf.tabs.toggle( nextTab );
-			if ( 'media' === nextTab ) {
-
-				// As it's the default remove the hash
-				window.location.hash = '';
-				if ( 'function' === typeof window.history.replaceState && '#' === window.location.href.slice( -1 ) ) {
-
-					// Strip the # if still on the end of the URL
-					history.replaceState( {}, '', window.location.href.slice( 0, -1 ) );
-				}
-			} else {
-				window.location.hash = nextTab;
-			}
-		} );
-
 		// Settings
 		// --------------------