Only show bulk action and button on upload page and make naming more consistent

Author: Jacob Middag

src/class-tiny-plugin.php

@@ -53,19 +53,20 @@ public function init() {
     public function admin_init() {
         add_filter('manage_media_columns', $this->get_method('add_media_columns'));
         add_action('manage_media_custom_column', $this->get_method('render_media_column'), 10, 2);
-        add_action('wp_ajax_tinypng_compress_image', $this->get_method('compress_image'));
-        add_action('admin_action_tinypng_bulk_compress', $this->get_method('bulk_compress'));
+        add_action('wp_ajax_tiny_compress_image', $this->get_method('compress_image'));
+        add_action('admin_action_tiny_bulk_compress', $this->get_method('bulk_compress'));
         add_action('admin_enqueue_scripts', $this->get_method('enqueue_scripts'));
     }
 
-    public function enqueue_scripts() {
+    public function enqueue_scripts($hook) {
         wp_enqueue_style(self::NAME .'_admin', plugins_url('/styles/admin.css', __FILE__),
             array(), self::plugin_version());
 
         $handle = self::NAME .'_admin';
         wp_register_script($handle, plugins_url('/scripts/admin.js', __FILE__),
             array(), self::plugin_version(), true);
-        wp_localize_script($handle, 'tinypngImageCompressL10n', array(
+
+        wp_localize_script($handle, 'tinyCompressL10n', array(
             'bulkAction' => self::translate('Compress all uncompressed sizes'),
         ));
         wp_enqueue_script($handle);
@@ -167,7 +168,7 @@ public function render_media_column($column, $id) {
                 if (($error = $tiny_metadata->get_latest_error())) {
                     echo '<span class="error">' . self::translate_escape('Latest error') . ': '. self::translate_escape($error) .'<br/>';
                 }
-                echo '<button type="button" class="tinypng-compress" data-id="' . $id . '">' .
+                echo '<button type="button" class="tiny-compress" data-id="' . $id . '">' .
                     self::translate_escape('Compress') . '</button>';
                 echo '<div class="spinner"></div>';
             } else {

src/scripts/admin.js

@@ -1,29 +1,33 @@
-(function () {
-  var compress_image = function(event) {
+(function() {
+
+  function compress_image(event) {
     var element = jQuery(event.target);
     element.attr('disabled', 'disabled');
     element.closest('td').find('.spinner').css('display', 'inline');
     jQuery.post(
       ajaxurl, {
-        'action': 'tinypng_compress_image',
+        'action': 'tiny_compress_image',
         'id': element.data('id') || element.attr('data-id')
       }, function (response) {
         element.closest('td').html(response);
       }
     );
   }
-  if (typeof jQuery.fn.on === "function") {
-    jQuery('table').on('click', 'button.tinypng-compress', compress_image);
-  } else {
-    jQuery('button.tinypng-compress').live('click', compress_image);
-  }
 
-  if (typeof jQuery.fn.prop === "function") {
-    jQuery('button.tinypng-compress').prop('disabled', null)
-  } else {
-    jQuery('button.tinypng-compress').attr('disabled', null)
-  }
+  if (adminpage === "upload-php") {
+    if (typeof jQuery.fn.on === "function") {
+      jQuery('table').on('click', 'button.tiny-compress', compress_image);
+    } else {
+      jQuery('button.tiny-compress').live('click', compress_image);
+    }
 
-  jQuery('<option>').val('tinypng_bulk_compress').text(tinypngImageCompressL10n.bulkAction).appendTo('select[name="action"]');
-  jQuery('<option>').val('tinypng_bulk_compress').text(tinypngImageCompressL10n.bulkAction).appendTo('select[name="action2"]');
+    if (typeof jQuery.fn.prop === "function") {
+      jQuery('button.tiny-compress').prop('disabled', null)
+    } else {
+      jQuery('button.tiny-compress').attr('disabled', null)
+    }
+
+    jQuery('<option>').val('tiny_bulk_compress').text(tinyCompressL10n.bulkAction).appendTo('select[name="action"]');
+    jQuery('<option>').val('tiny_bulk_compress').text(tinyCompressL10n.bulkAction).appendTo('select[name="action2"]');
+  }
 }).call();

src/styles/admin.css

@@ -1,3 +1,3 @@
-.tinypng-image-compression .spinner {
+.tiny-compress-images .spinner {
     display: none;
 }

test/integration/BulkCompressIntegrationTest.php

@@ -17,9 +17,9 @@ public function testBulkCompressActionShouldBePresent()
     {
         $this->upload_image(dirname(__FILE__) . '/../fixtures/example-tinypng.png');
         self::$driver->get(wordpress('/wp-admin/upload.php?mode=list'));
-        $this->assertEquals('tinypng_bulk_compress', self::$driver->findElement(
-            WebDriverBy::cssSelector('select[name="action"] option[value="tinypng_bulk_compress"]')
-        )->getAttribute('value'));
+        $this->assertEquals('Compress all uncompressed sizes', self::$driver->findElement(
+            WebDriverBy::cssSelector('select[name="action"] option[value="tiny_bulk_compress"]')
+        )->getText());
     }
 
     public function testBulkCompressShouldCompressUncompressedSizes() {
@@ -29,7 +29,7 @@ public function testBulkCompressShouldCompressUncompressedSizes() {
         $this->upload_image(dirname(__FILE__) . '/../fixtures/example-large.png');
 
         $this->enable_compression_sizes(array('thumbnail', 'medium'));
-        media_bulk_action(self::$driver, 'tinypng_bulk_compress');
+        media_bulk_action(self::$driver, 'tiny_bulk_compress');
 
         $this->assertContains('Compressed 2 out of 2 sizes', self::$driver->findElement(WebDriverBy::cssSelector('td.tiny-compress-images'))->getText());
     }