Deploying version 0.9

Author: mattgrshaw

asset/dist/css/styles.css

@@ -27,10 +27,14 @@ function wpmdb_toggle_migration_action_text() {
 /**
  * Return the currently selected migration type selected.
  *
- * @return string Will return `push`, `pull`, or `savefile` for exporting as a file.
+ * @return string Will return `push`, `pull`, `savefile`, or `` for exporting as a file.
  */
 function wpmdb_migration_type() {
-	return jQuery( 'input[name=action]:checked' ).val();
+	var action = jQuery( 'input[name=action]:checked' );
+	if ( 0 === action.length ) {
+		return '';
+	}
+	return action.val();
 }
 
 function wpmdb_call_next_hook() {
@@ -157,26 +161,35 @@ wpmdb.subsite_for_table = function( table_prefix, table_name ) {
 	}
 };
 
-wpmdb.functions.convertKBSizeToHR = function( size, dec, kbSize ) {
+wpmdb.functions.convertKBSizeToHR = function( size, dec, kbSize, retArray ) {
+	var retVal, units;
 	kbSize = kbSize || 1000;
 	dec = dec || 2;
 	size = parseInt( size );
 
 	if ( kbSize > Math.abs( size ) ) {
-		return size.toFixed( 0 ) + ' KB';
+		retVal = [ size.toFixed( 0 ), 'KB' ];
+	} else {
+		units = [ 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];
+		var u = -1;
+		do {
+			size /= kbSize;
+			++u;
+		} while ( Math.abs( size ) >= kbSize && u < units.length - 1 );
+		retVal = [ Math.round( size * Math.pow( 10, dec ) ) / Math.pow( 10, dec ), units[ u ] ];
 	}
-	var units = [ 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ];
-	var u = -1;
-	do {
-		size /= kbSize;
-		++u;
-	} while ( Math.abs( size ) >= kbSize && u < units.length - 1 );
-
-	return Math.round( size * Math.pow( 10, dec ) ) / Math.pow( 10, dec ) + ' ' + units[ u ];
-};
 
-(function( $ ) {
-
-	// jQuery code here
+	if ( ! retArray ) {
+		retVal = retVal[0] + ' ' + retVal[1];
+	}
+	return retVal;
+};
 
-})( jQuery );
+wpmdb.functions.convertKBSizeToHRFixed = function( size, dec, kbSize ) {
+	dec = dec || 2;
+	var hrSizeArray = wpmdb.functions.convertKBSizeToHR( size, dec, kbSize, true );
+	if ( 'KB' !== hrSizeArray[1] ) {
+		return hrSizeArray[ 0 ].toFixed( 2 ) + ' ' + hrSizeArray[ 1 ];
+	}
+	return hrSizeArray[ 0 ] + ' ' + hrSizeArray[ 1 ];
+};

asset/dist/js/common.js renamed to asset/dist/js/common-09.js

@@ -16,7 +16,7 @@ wpmdb.multisite = {};
 
 				var selected = ' ';
 				if ( ( undefined === selected_subsite_ids || null === selected_subsite_ids || 0 === selected_subsite_ids.length ) ||
-					( undefined !== selected_subsite_ids && null !== selected_subsite_ids && 0 < selected_subsite_ids.length && -1 !== $.inArray( blog_id, selected_subsite_ids ) )
+				     ( undefined !== selected_subsite_ids && null !== selected_subsite_ids && 0 < selected_subsite_ids.length && -1 !== $.inArray( blog_id, selected_subsite_ids ) )
 				) {
 					selected = ' selected="selected" ';
 					site_selected = true;
@@ -31,5 +31,4 @@ wpmdb.multisite = {};
 			}
 		}
 	};
-
 })( jQuery, wpmdb );

asset/dist/js/common-09.min.js

@@ -0,0 +1,83 @@
+(function( $ ) {
+
+	var doing_check_licence = false;
+	var fade_duration = 650;
+
+	var admin_url = ajaxurl.replace( '/admin-ajax.php', '' );
+	var spinner_url = admin_url + '/images/spinner';
+	var spinner;
+	if ( 2 < window.devicePixelRatio ) {
+		spinner_url += '-2x';
+	}
+	spinner_url += '.gif';
+	spinner = $( '<img src="' + spinner_url + '" alt="" class="check-licence-spinner" />' );
+
+	$( document ).ready( function() {
+
+		$( 'body' ).on( 'click', '.check-my-licence-again', function( e ) {
+			e.preventDefault();
+			$( this ).blur();
+
+			if ( doing_check_licence ) {
+				return false;
+			}
+
+			doing_check_licence = true;
+
+			$( this ).hide();
+			spinner.insertAfter( this );
+
+			var check_again_link = ' <a class="check-my-licence-again" href="#">' + wpmdb_update_strings.check_license_again + '</a>';
+
+			$.ajax( {
+				url: ajaxurl,
+				type: 'POST',
+				dataType: 'json',
+				cache: false,
+				data: {
+					action: 'wpmdb_check_licence',
+					nonce: wpmdb_nonces.check_licence,
+					context: 'update'
+				},
+				error: function( jqXHR, textStatus, errorThrown ) {
+					doing_check_licence = false;
+					$( '.wpmdb-licence-error-notice' ).fadeOut( fade_duration, function() {
+						$( '.wpmdb-licence-error-notice' ).empty()
+							.html( wpmdb_update_strings.license_check_problem + check_again_link )
+							.fadeIn( fade_duration );
+					} );
+				},
+				success: function( data ) {
+					doing_check_licence = false;
+					if ( 'undefined' !== typeof data.errors ) {
+						var msg = '';
+						for ( var key in data.errors ) {
+							msg += data.errors[ key ];
+						}
+						$( '.wpmdb-licence-error-notice' ).fadeOut( fade_duration, function() {
+							$( '.check-licence-spinner' ).remove();
+							$( '.wpmdb-licence-error-notice' ).empty()
+								.html( msg )
+								.fadeIn( fade_duration );
+						} );
+					} else {
+
+						// Success
+						// Fade out, empty wpmdb custom error content, swap back in the original wordpress upgrade message, fade in
+						$( '.wpmdbpro-custom-visible' ).fadeOut( fade_duration, function() {
+							$( '.check-licence-spinner' ).remove();
+							$( '.wpmdbpro-custom-visible' ).empty()
+								.html( $( '.wpmdb-original-update-row' ).html() )
+								.fadeIn( fade_duration );
+						} );
+					}
+				}
+			} );
+
+		} );
+
+		$( '.wpmdbpro-custom' ).prev().addClass( 'wpmdbpro-has-message' );
+
+	} );
+
+})( jQuery );