sync fork with master

koikaam · Jun 26, 2014 · 7d78888 · 7d78888
2 parents db896e3 + 5dcd19f
commit 7d78888
Show file tree

Hide file tree

Showing 372 changed files with 8,014 additions and 715,559 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -107,18 +107,6 @@ module.exports = function( grunt ){
 				stdout: true,
 				stderr: true
 			},
-			txpull: {
-				command: [
-					'cd i18n',
-					'tx pull -a -f',
-				].join( '&&' )
-			},
-			generatemos: {
-				command: [
-					'cd i18n/languages',
-					'for i in *.po; do msgfmt $i -o ${i%%.*}.mo; done'
-				].join( '&&' )
-			},
 			generatepot: {
 				command: [
 					'cd i18n/makepot/',
@@ -193,13 +181,11 @@ module.exports = function( grunt ){
 
 	grunt.registerTask( 'dev', [
 		'default',
-		'shell:txpull',
-		'shell:generatemos'
+		'pot'
 	]);
 
 	grunt.registerTask( 'deploy', [ 
 		'clean:deploy', 
 		'copy:deploy'
 	]);
-
-};
+};
diff --git a/assets/css/admin.css b/assets/css/admin.css
diff --git a/assets/css/admin.less b/assets/css/admin.less
@@ -181,6 +181,15 @@ table.wc_status_table {
 		outline: 0;
 	}
 }
+#log-viewer-select {
+	padding: 10px 0 8px;
+	line-height: 180%;
+}
+#log-viewer {
+	textarea {
+		width: 100%;
+	}
+}
 
 /* Bulk/Quick edit */
 .inline-edit-product.quick-edit-row {

diff --git a/assets/js/admin/editor_plugin.js b/assets/js/admin/editor_plugin.js
diff --git a/assets/js/admin/editor_plugin.min.js b/assets/js/admin/editor_plugin.min.js
diff --git a/assets/js/admin/editor_plugin_lang.php b/assets/js/admin/editor_plugin_lang.php
diff --git a/assets/js/admin/meta-boxes-variations.js b/assets/js/admin/meta-boxes-variations.js
@@ -324,7 +324,7 @@ jQuery( function ( $ ) {
 		if ( $button.is( '.remove' ) ) {
 
 			setting_variation_image.find( '.upload_image_id' ).val( '' );
-			setting_variation_image.find( 'img' ).attr( 'src', woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src );
+			setting_variation_image.find( 'img' ).eq( 0 ).attr( 'src', woocommerce_admin_meta_boxes_variations.woocommerce_placeholder_img_src );
 			setting_variation_image.find( '.upload_image_button' ).removeClass( 'remove' );
 
 		} else {
@@ -356,11 +356,12 @@ jQuery( function ( $ ) {
 			// When an image is selected, run a callback.
 			variable_image_frame.on( 'select', function () {
 
-				var attachment = variable_image_frame.state().get( 'selection' ).first().toJSON();
+				var attachment = variable_image_frame.state().get( 'selection' ).first().toJSON(),
+					url = attachment.sizes.thumbnail ? attachment.sizes.thumbnail.url : attachment.url;
 
 				setting_variation_image.find( '.upload_image_id' ).val( attachment.id );
 				setting_variation_image.find( '.upload_image_button' ).addClass( 'remove' );
-				setting_variation_image.find( 'img' ).attr( 'src', attachment.url );
+				setting_variation_image.find( 'img' ).eq( 0 ).attr( 'src', url );
 
 				wp.media.model.settings.post.id = wp_media_post_id;
 			});