Changeset 1435729

Timestamp:

06/13/2016 10:18:34 AM (10 years ago)

Author:

winsite

Message:

Update to commit 84aac03 from git@…:win-site/winsite-image-optimizer.git

Location:

winsite-image-optimizer

Files:

• tags/1.0.2 (added)
• tags/1.0.2/.eslintignore (added)
• tags/1.0.2/.eslintrc (added)
• tags/1.0.2/bin (added)
• tags/1.0.2/bin/install-wp-tests.sh (added)
• tags/1.0.2/composer.json.x (added)
• tags/1.0.2/includes (added)
• tags/1.0.2/includes/class-wsi-hooks.php (added)
• tags/1.0.2/includes/class-wsi-retro-processor.php (added)
• tags/1.0.2/includes/class-wsi-the-golden-retriever.php (added)
• tags/1.0.2/includes/engines (added)
• tags/1.0.2/includes/engines/abstract-class-wsi-engine.php (added)
• tags/1.0.2/includes/engines/class-wsi-engine-imageoptim.php (added)
• tags/1.0.2/notes.txt (added)
• tags/1.0.2/readme.txt (added)
• tags/1.0.2/static (added)
• tags/1.0.2/static/js (added)
• tags/1.0.2/static/js/winsite-image-optimizer.js (added)
• tags/1.0.2/winsite-image-optimizer.php (added)
• trunk/includes/class-wsi-hooks.php (modified) (1 diff)
• trunk/includes/class-wsi-retro-processor.php (modified) (5 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/static (added)
• trunk/static/js (added)
• trunk/static/js/winsite-image-optimizer.js (added)
• trunk/winsite-image-optimizer.php (modified) (1 diff)

winsite-image-optimizer/trunk/includes/class-wsi-hooks.php

@@ -128 +128 @@
         add_filter( 'wp_handle_upload', array($this, __FUNCTION__), 10, 2 );
 
-        // Important! Unlink the temp file, but measure size beforehand
-        if ( winsite_image_optimizer()->retro->get_setting( 'should-keep-original' ) != '1' && file_exists( $orig_file['file'] ) ) {
+        if ( file_exists( $orig_file['file'] ) ) {
+            // Measure size beforehand
             $this->last_file_size = filesize( $orig_file['file'] );
-            // Goodbye.
-            unlink( $orig_file['file'] );
+
+            // Important! Unlink the temp file if noted so in settings
+            if ( winsite_image_optimizer()->retro->get_setting( 'should-keep-original' ) != '1' ) {
+                // Goodbye.
+                unlink( $orig_file['file'] );
+            }
         }
 

winsite-image-optimizer/trunk/includes/class-wsi-retro-processor.php

@@ -59 +59 @@
     public function page_load() {
         // Enqueue assets
-        wp_enqueue_script( 'wsi-main', plugins_url( 'assets/js/winsite-image-optimizer.js', dirname( __FILE__ ) ), array( 'jquery' ) );
+        wp_enqueue_script( 'wsi-main', plugins_url( 'static/js/winsite-image-optimizer.js', dirname( __FILE__ ) ), array( 'jquery' ) );
 
         $args = array(
@@ -164 +164 @@
                 <button class="button button-primary" type="submit">Regenerate Retroactive</button>
                 <span class="status status-finished"><span class="dashicons dashicons-yes"></span> Finished</span>
+                <span class="spinner"></span>
             </form>
         </div>
@@ -169 +170 @@
         <style>
         #wsi-regeneretro .status { display: none; }
+        #wsi-regeneretro .status-active { display: inline-block; }
+        #wsi-regeneretro .spinner {
+            float: none;
+            display: inline-block;  
+        }
         #wsi-regeneretro .status.status-display {
             display: inline-block;
@@ -232 +238 @@
 
         // update in meta that it got processed
-        update_post_meta( $image->ID, 'wsi_photonized', '1' );
+        update_post_meta( $image->ID, '_wsi_photonized', '1' );
 
         if ( file_exists( $fullsizepath ) ) {
             update_post_meta( $image->ID, '_wsi_original_filesize', filesize( $fullsizepath ) );
 
-            // Delete old image while we're at it
-            unlink( $fullsizepath );
+            // Should we unlink this file?
+            if ( winsite_image_optimizer()->retro->get_setting( 'should-keep-original' ) != '1' ) {
+                // Delete old image while we're at it
+                unlink( $fullsizepath );
+            }
         }
 
@@ -266 +275 @@
     }
 
+    /**
+     * @todo update with WP new JSON functions
+     */
     public function die_json_error_msg( $id, $message ) {
         die( json_encode( array( 'error' => sprintf( __( '&quot;%1$s&quot; (ID %2$s) failed to resize. The error message was: %3$s', 'regenerate-thumbnails' ), esc_html( get_the_title( $id ) ), $id, $message ) ) ) );

winsite-image-optimizer/trunk/readme.txt

@@ -48 +48 @@
 == Changelog ==
 
+= 1.0.2 - June 13, 2016 
+* Bug fix: Fixed issue where JS wasn't loading in back-end, disabling use of the Retroactive Generator. Props [@maor](https://github.com/maor)
+* Improved UX on Retroactive Image Generator page by adding an spinner/indicator when process runs. Props [@maor](https://github.com/maor)
+* Bug fix: Fixed issue where images that got processed would be able to get procesed again with the Retroactive Gen. Props [@maor](https://github.com/maor)
+
 = 1.0.1 - June 8, 2016 =
 Allow inputting ImageOptim username via Media settings page. Props [@maor](https://github.com/maor)

winsite-image-optimizer/trunk/winsite-image-optimizer.php

@@ -4 +4 @@
  * Plugin URI: http://win-site.co.il
  * Description: Optimize your images, period.
- * Version: 1.0.1
+ * Version: 1.0.2
  * Author: Winsite
  * Author URI: http://win-site.co.il