WordPress.org
Get WordPress

Plugin Directory

Changeset 1020871


Ignore:
Timestamp:
11/06/2014 12:01:26 PM (11 years ago)
Author:
alancf
Message:

resolving svn conflicts

Location:
flickr-media-scanner
Files:
1 added
2 edited
2 copied

Legend:

Unmodified
Added
Removed

  • flickr-media-scanner/tags/1.0.4/assets/js/admin.js

    r1020716 r1020871  
    1111    if(flickr_images.length > 0 && fms_api_key != '') {
    1212        doAjaxCall();
     13        jQuery('#fms-scan').attr('disabled','disabled');
     14        jQuery('#fms-scan').attr('value','Scanning...');
    1315    }
    1416
    … …  
    3537    if(flickr_index < flickr_images.length) {
    3638        doAjaxCall();
     39    } else {
     40        jQuery('#fms-scan').removeAttr('disabled');
     41        jQuery('#fms-scan').attr('value','Scan now');
    3742    }
    3843}

  • flickr-media-scanner/trunk/assets/js/admin.js

    r1020716 r1020871  
    1111    if(flickr_images.length > 0 && fms_api_key != '') {
    1212        doAjaxCall();
     13        jQuery('#fms-scan').attr('disabled','disabled');
     14        jQuery('#fms-scan').attr('value','Scanning...');
    1315    }
    1416
    … …  
    3537    if(flickr_index < flickr_images.length) {
    3638        doAjaxCall();
     39    } else {
     40        jQuery('#fms-scan').removeAttr('disabled');
     41        jQuery('#fms-scan').attr('value','Scan now');
    3742    }
    3843}
Note: See TracChangeset for help on using the changeset viewer.