WordPress.org
Get WordPress

Plugin Directory

Changeset 521312


Ignore:
Timestamp:
03/20/2012 12:50:09 PM (14 years ago)
Author:
orangelab
Message:

Further fixes for -beta2

Location:
imagemagick-engine/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • imagemagick-engine/trunk/imagemagick-engine.php

    r466984 r521312  
    3030/*
    3131 * Current todo list:
     32 * - show more info when resizing: current id, something spinning?
    3233 * - test and handle negative returns in regen
    33  * - show more info when resizing: current id, something spinning?
    3434 * - can we use --strip (or similar) without loosing color profile?
    3535 * - test command line version string
    … …  
    586586function ime_ajax_process_image() {
    587587    global $ime_image_sizes, $ime_image_file, $_wp_additional_image_sizes;
    588 
    589     error_reporting(E_ALL);
     588   
     589    error_reporting(E_ERROR | E_WARNING);
    590590
    591591    if (!current_user_can('manage_options') || !ime_mode_valid())
    … …  
    711711function ime_admin_print_scripts() {
    712712    wp_enqueue_script('ime-admin');
     713
     714    $data = array('noimg' => __('You dont have any images to regenerate', 'imagemagick-engine')
     715              , 'done' => __('All done!', 'imagemagick-engine')
     716              , 'processed_fmt' => __('Processed %d images', 'imagemagick-engine')
     717              , 'failed' => '<strong>' . __('Failed to resize image!', 'imagemagick-engine') . '</strong>'
     718              , 'resized' => __('Resized using ImageMagick Engine', 'imagemagick-engine')
     719              );
     720    wp_localize_script('ime-admin', 'ime_admin', $data);
    713721}
    714722
    … …  
    733741 */
    734742function ime_filter_media_meta($content, $post) {
     743    if (!ime_mode_valid())
     744        return $content;
     745
     746    if (!gd_edit_image_support($post->post_mime_type))
     747        return $content;
     748   
    735749    $metadata = wp_get_attachment_metadata($post->ID);
    736750
    737     if (!is_array($metadata) || !array_key_exists('image-converter', $metadata))
    738         return $content;
    739 
    740751    $ime = false;
    741     foreach ($metadata['image-converter'] as $size => $converter) {
    742         if ($converter != 'IME')
    743             continue;
    744 
    745         $ime = true;
    746         break;
    747     }
    748 
     752    if (is_array($metadata) && array_key_exists('image-converter', $metadata)) {
     753        foreach ($metadata['image-converter'] as $size => $converter) {
     754            if ($converter != 'IME')
     755                continue;
     756
     757            $ime = true;
     758            break;
     759        }
     760    }
     761
     762    $content .= '</p><p>';
    749763    if ($ime) {
    750         $content .= '</p><p><i>' . __('Resized using ImageMagick Engine', 'imagemagick-engine') . '</i>';
     764        $content .= ' <span class="ime-media-message" id="ime-message-' . $post->ID . '">' . __('Resized using ImageMagick Engine', 'imagemagick-engine') . '</span>';
    751765        $resize = __('Force resize', 'imagemagick-engine');
    752766        $force = '1';
    753767    } else {
     768        $content .= '<span class="ime-media-message" id="ime-message-' . $post->ID . '" style="display: none;"></span>';
    754769        $resize = __('Resize using ImageMagick Engine', 'imagemagick-engine');
    755770        $force = '0';
    … …  
    764779    $sizes = implode('|', $sizes);
    765780    $resize_call = 'imeRegenMediaImage(' . $post->ID . ', \'' . $sizes . '\', ' . $force . '); return false;';
    766     $content .= ' <a href="#" id="ime-regen-link-' . $post->ID . '" class="button" onclick="' . $resize_call . '">' . $resize . '</a>';
     781    $content .= ' <a href="#" id="ime-regen-link-' . $post->ID . '" class="button ime-regen-button" onclick="' . $resize_call . '">' . $resize . '</a>';
    767782   
    768783    return $content;
    … …  
    879894  <form action="options-general.php?page=imagemagick-engine" method="post" name="update_options">
    880895    <?php wp_nonce_field('ime-options'); ?>
    881     <input type="hidden" name="rt_message_noimg" id="rt_message_noimg" value="<?php _e('You dont have any images to regenerate', 'imagemagick-engine'); ?>" />
    882     <input type="hidden" name="rt_message_done" id="rt_message_done" value="<?php _e('All done!', 'imagemagick-engine'); ?>" />
    883     <input type="hidden" name="rt_message_processed" id="rt_message_processed" value="<?php _e('Processed', 'imagemagick-engine'); ?>" />
    884     <input type="hidden" name="rt_message_images" id="rt_message_images" value="<?php _e('images', 'imagemagick-engine'); ?>" />
    885896  <div id="poststuff" class="metabox-holder has-right-sidebar">
    886897    <div class="inner-sidebar">

  • imagemagick-engine/trunk/js/ime-admin.js

    r466984 r521312  
    44var rt_count = 1;
    55var rt_force = 0;
     6var rt_precision = 0;
    67var rt_sizes = "";
    78
    … …  
    4344    }
    4445
     46    if (rt_images.length > 200)
     47    rt_precision = 1;
     48    if (rt_images.length > 2000)
     49    rt_precision = 2;
     50    if (rt_images.length > 20000)
     51    rt_precision = 3;
     52
     53    var rt_percent = 0;
     54
    4555    rt_count = 1;
    4656    jQuery("#regenbar").progressbar();
    47     jQuery("#regenbar-percent").html( "0%" );
     57    jQuery("#regenbar-percent").html( rt_percent.toFixed(rt_precision) + " %" );
    4858    jQuery('#regeneration').dialog('open');
    4959
    … …  
    6171
    6272    if ( rt_images.length <= 0 ) {
    63         jQuery('#regen-message').removeClass('hidden').html("<p><strong>"+jQuery('#rt_message_done').val()+"</strong> "+jQuery('#rt_message_processed').val()+" "+rt_total+" "+jQuery('#rt_message_images').val()+".</p>");
     73        jQuery('#regen-message').removeClass('hidden').html("<p><strong>" + ime_admin.done + "</strong> " + ime_admin.processed_fmt.replace('%d', rt_total) + ".</p>");
    6474        jQuery('#regeneration').dialog('close');
    6575        jQuery("#regenbar").progressbar( "value", 0 );
    … …  
    7080    var rt_percent = ( rt_count / rt_total ) * 100;
    7181    jQuery("#regenbar").progressbar( "value", rt_percent );
    72     jQuery("#regenbar-percent").html( "(" + next_id + ")" + Math.round(rt_percent) + "%" );
     82    jQuery("#regenbar-percent").html( rt_percent.toFixed(rt_precision) + " %" );
    7383    rt_count = rt_count + 1;
    7484
    … …  
    8090// Regen single image on media pages
    8191function imeRegenMediaImage( id, sizes, force ) {
    82     var link = jQuery('#ime-regen-link-' + id);
    83     link.hide();
     92    jQuery('#ime-regen-link-' + id).remove();
     93    var message = jQuery('#ime-message-' + id).html('').addClass('ime-working').show();
    8494    jQuery.post(ajaxurl, { action: "ime_process_image", id: id, sizes: sizes, force: force }, function(data) {
    85     link.show();
    8695    var n = parseInt(data, 10);
    87     if (isNaN(n) || n < 0)
    88         alert('Failed to resize image!');
    89     else
    90         alert('Resize done');
     96    if (isNaN(n) || n < 0) {
     97        message.removeClass('ime-working').html(ime_admin.failed);
     98        if (isNaN(n))
     99        alert(data);
     100    } else {
     101        message.removeClass('ime-working').html(ime_admin.resized);
     102    }
    91103    });
    92104}
    … …  
    129141        imeStartResize();
    130142        } else {
    131         alert($('#rt_message_noimg').val());
     143        alert(ime_admin.noimg);
    132144        }
    133145    });

  • imagemagick-engine/trunk/readme.txt

    r453352 r521312  
    33Tags: image, images, picture, imagemagick, gd
    44Requires at least: 2.9
    5 Tested up to: 3.3-beta2
     5Tested up to: 3.3.1
    66Stable tag: 1.3.1
    77
    … …  
    1919* Configure image quality or use dynamically computed default value.
    2020
    21 Translations: German, Swedish
     21Translations: French, German, Swedish
    2222
    2323Requires either ImageMagick binary or Imagick PHP module.
    … …  
    7474
    7575== Changelog ==
     76
     77= 1.3.2-beta2 =
     78* Tested with WP 3.3.1
     79* More sanity tests in ajax resize code
     80* Add more precision to resize % when large nr of images
     81* Resize / Force resize button in media library
     82* French translation thanks to Damien Fabreguettes
    7683
    7784= 1.3.2-beta1 =
Note: See TracChangeset for help on using the changeset viewer.