Merge pull request #57 from DevinWalker/fix/single-theme-button

Author: DevinWalker

assets/css/wp-rollback.css

@@ -29,8 +29,8 @@
 }
 
 .wpr-versions-wrap {
-	padding-left: 20px;
-	margin-bottom:30px;
+	margin: 0 0 30px;
+	padding: 0 0 0 4px;
 }
 
 .wpr-versions-wrap .wpr-error {
@@ -76,7 +76,7 @@
 
 .wpr-version-li {
 	clear: left;
-	padding: 8px 0;
+	padding: 8px;
 	overflow: hidden;
 	width: 800px;
 }

assets/js/themes-wp-rollback.js

@@ -10,7 +10,7 @@ jQuery.noConflict();
 (function( $ ) {
 
 	/**
-	 * Content Change DOM Event Listenter
+	 * Content Change DOM Event Listener
 	 *
 	 * @see: http://stackoverflow.com/questions/3233991/jquery-watch-div/3234646#3234646
 	 * @param callback
@@ -31,7 +31,7 @@ jQuery.noConflict();
 	setInterval( function() {
 		if ( window.watchContentChange ) {
 			for ( i in window.watchContentChange ) {
-				if ( window.watchContentChange[ i ].element.data( 'lastContents' ) != window.watchContentChange[ i ].element.html() ) {
+				if ( window.watchContentChange[ i ].element.data( 'lastContents' ) !== window.watchContentChange[ i ].element.html() ) {
 					window.watchContentChange[ i ].callback.apply( window.watchContentChange[ i ].element );
 					window.watchContentChange[ i ].element.data( 'lastContents', window.watchContentChange[ i ].element.html() );
 				}
@@ -47,6 +47,12 @@ jQuery.noConflict();
 		themes = wp.themes = wp.themes || {};
 		themes.data = typeof _wpThemeSettings !== 'undefined' ? _wpThemeSettings : '';
 
+		// Is only one theme active?
+		if( themes.data.themes.length === 1 ) {
+			// Show the rollback button.
+			wpr_theme_rollback(themes.data.themes[0].id);
+		}
+
 		// On clicking a theme template
 		$( '.theme-overlay' ).contentChange( function( e ) {
 
@@ -81,7 +87,9 @@ jQuery.noConflict();
 		/**
 		 * Is Theme WordPress.org?
 		 *
-		 * @description Rollback only supports WordPress.org themes
+		 * Rollback only supports WordPress.org themes.
+		 *
+		 * @param theme
 		 */
 		function wpr_theme_rollback( theme ) {
 
@@ -163,9 +171,7 @@ jQuery.noConflict();
 		 * Send them over to rollback.
 		 */
 		$( 'body' ).on( 'click', '.wpr-theme-rollback', function( e ) {
-
 			window.location = $( this ).attr( 'href' );
-
 		} );
 
 	} );

package-lock.json

@@ -26,13 +26,13 @@ We provide no (zero) assurances, guarantees, or warranties that the plugin, them
 
 = Translation Ready =
 
-Do you speak another language? Want to contribute in a meaninful way to WP Rollback? There's no better way than to help us translate the plugin. This plugin is translation ready. Simply use the wp-rollback.pot file and your favorite translation tool. Once finished, please reach out to us on the WordPress.org forums or better yet, submit a pull request on the [Github Repo](https://github.com/impress-org/wp-rollback/).
+Do you speak another language? Want to contribute in a meaningful way to WP Rollback? There's no better way than to help us translate the plugin. This plugin is translation ready. Simply header over to the WP Rollback [translation project](https://translate.wordpress.org/projects/wp-plugins/wp-rollback/) that's powered by WordPress.org volunteer translators. There you can contribute to the translation of the plugin into your language.
 
 = Support and Documentation =
 
 We answer all support requests [on the WordPress.org support forum](https://wordpress.org/support/plugin/wp-rollback).
 
-WP Rollback was created to be as intuitive to the natural WordPress experience as possible. There are is no dedicated setting page or option panels. We believe that once you activate WP Rollback, you'll quickly discover exactly how it works without question.
+WP Rollback was created to be as intuitive to the natural WordPress experience as possible. There are is no dedicated settings page or options panel. We believe that once you activate WP Rollback, you'll quickly discover exactly how it works without question.
 
 **BUT!!**
 
@@ -108,8 +108,9 @@ This is the first version of this plugin. It is a tool for your convenience. Rol
 == Changelog ==
 
 = 1.7.2 =
-* Fix: The Rollback button now appears as expected when only one theme is installed.
+* Fix: Ensure that the "Rollback" button displays properly when a WordPress site only has a single theme installed. Thanks [@eldertech](https://wordpress.org/support/users/eldertech/) for your help uncovering this bug.
 * Fix: Minor CSS fixes for the Rollback page.
+* Tweak: Update the WordPress.org readme.txt file to have better instructions for translating the plugin. We also fixed a few typos.
 
 = 1.7.1 =
 * Fix: Prevent PHP notice when rolling back a plugin or theme on PHP 7.4.

readme.txt

@@ -570,7 +570,7 @@ private function set_plugin_slug() {
 		/**
 		 * Admin Menu
 		 *
-		 * @description: Adds a 'hidden' menu item that is activated when the user elects to rollback
+		 * Adds a 'hidden' menu item that is activated when the user elects to rollback
 		 */
 		public function admin_menu() {
 
@@ -864,7 +864,7 @@ function wpr_prepare_themes_js( $prepared_themes ) {
 			$rollbacks = array();
 			$wp_themes = get_site_transient( 'rollback_themes' );
 
-			// Double check our transient is present.
+			// Double-check our transient is present.
 			if ( empty( $wp_themes ) || ! is_object( $wp_themes ) ) {
 				$this->wpr_theme_updates_list();
 				$wp_themes = get_site_transient( 'rollback_themes' );