Wordpress 2.9

[autoinstalls/wordpress.git] / wp-includes / js / swfupload / handlers.dev.js

diff --git a/wp-includes/js/swfupload/handlers.dev.js b/wp-includes/js/swfupload/handlers.dev.js
index bc7e5ef95195c35c34e9d371871a6cc554285b3d..fb11c924cc253a2eed368c7740ae39ac5c564ece 100644 (file)
--- a/wp-includes/js/swfupload/handlers.dev.js
+++ b/wp-includes/js/swfupload/handlers.dev.js
@@ -8,7 +8,7 @@ function fileQueued(fileObj) {
        // Get rid of unused form
        jQuery('.media-blank').remove();
        // Collapse a single item
        // Get rid of unused form
        jQuery('.media-blank').remove();
        // Collapse a single item

-       if ( jQuery('.type-form #media-items>*').length == 1 && jQuery('#media-items .hidden').length > 0 ) {
+       if ( jQuery('form.type-form #media-items').children().length == 1 && jQuery('.hidden', '#media-items').length > 0 ) {

                jQuery('.describe-toggle-on').show();
                jQuery('.describe-toggle-off').hide();
                jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
                jQuery('.describe-toggle-on').show();
                jQuery('.describe-toggle-off').hide();
                jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');


@@ -16,7 +16,7 @@ function fileQueued(fileObj) {
        // Create a progress bar containing the filename
        jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><div class="progress"><div class="bar"></div></div><div class="filename original"><span class="percent"></span> ' + fileObj.name + '</div></div>');
        // Display the progress div
        // Create a progress bar containing the filename
        jQuery('#media-items').append('<div id="media-item-' + fileObj.id + '" class="media-item child-of-' + post_id + '"><div class="progress"><div class="bar"></div></div><div class="filename original"><span class="percent"></span> ' + fileObj.name + '</div></div>');
        // Display the progress div

-       jQuery('#media-item-' + fileObj.id + ' .progress').show();
+       jQuery('.progress', '#media-item-' + fileObj.id).show();

 
        // Disable submit and enable cancel
        jQuery('#insert-gallery').attr('disabled', 'disabled');
 
        // Disable submit and enable cancel
        jQuery('#insert-gallery').attr('disabled', 'disabled');


@@ -29,63 +29,108 @@ function uploadStart(fileObj) {
 
 function uploadProgress(fileObj, bytesDone, bytesTotal) {
        // Lengthen the progress bar
 
 function uploadProgress(fileObj, bytesDone, bytesTotal) {
        // Lengthen the progress bar

-       var w = jQuery('#media-items').width() - 2;
-       jQuery('#media-item-' + fileObj.id + ' .bar').width( w * bytesDone / bytesTotal );
-       jQuery('#media-item-' + fileObj.id + ' .percent').html( Math.ceil(bytesDone / bytesTotal * 100) + '%' );
+       var w = jQuery('#media-items').width() - 2, item = jQuery('#media-item-' + fileObj.id);
+       jQuery('.bar', item).width( w * bytesDone / bytesTotal );
+       jQuery('.percent', item).html( Math.ceil(bytesDone / bytesTotal * 100) + '%' );

 
        if ( bytesDone == bytesTotal )
 
        if ( bytesDone == bytesTotal )

-               jQuery('#media-item-' + fileObj.id + ' .bar').html('<strong class="crunching">' + swfuploadL10n.crunching + '</strong>');
+               jQuery('.bar', item).html('<strong class="crunching">' + swfuploadL10n.crunching + '</strong>');

 }
 
 function prepareMediaItem(fileObj, serverData) {
 }
 
 function prepareMediaItem(fileObj, serverData) {

+       var f = ( typeof shortform == 'undefined' ) ? 1 : 2, item = jQuery('#media-item-' + fileObj.id);

        // Move the progress bar to 100%
        // Move the progress bar to 100%

-       jQuery('#media-item-' + fileObj.id + ' .bar').remove();
-       jQuery('#media-item-' + fileObj.id + ' .progress').hide();
+       jQuery('.bar', item).remove();
+       jQuery('.progress', item).hide();

 
 

-       var f = ( typeof shortform == 'undefined' ) ? 1 : 2;

        // Old style: Append the HTML returned by the server -- thumbnail and form inputs
        if ( isNaN(serverData) || !serverData ) {
        // Old style: Append the HTML returned by the server -- thumbnail and form inputs
        if ( isNaN(serverData) || !serverData ) {

-               jQuery('#media-item-' + fileObj.id).append(serverData);
+               item.append(serverData);

                prepareMediaItemInit(fileObj);
        }
        // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
        else {
                prepareMediaItemInit(fileObj);
        }
        // New style: server data is just the attachment ID, fetch the thumbnail and form html from the server
        else {

-               jQuery('#media-item-' + fileObj.id).load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});
+               item.load('async-upload.php', {attachment_id:serverData, fetch:f}, function(){prepareMediaItemInit(fileObj);updateMediaForm()});

        }
 }
        }
 }

-               
-function prepareMediaItemInit(fileObj) {

 
 

+function prepareMediaItemInit(fileObj) {
+       var item = jQuery('#media-item-' + fileObj.id);

        // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename
        // Clone the thumbnail as a "pinkynail" -- a tiny image to the left of the filename

-       jQuery('#media-item-' + fileObj.id + ' .thumbnail').clone().attr('className', 'pinkynail toggle').prependTo('#media-item-' + fileObj.id);
+       jQuery('.thumbnail', item).clone().attr('className', 'pinkynail toggle').prependTo(item);

 
        // Replace the original filename with the new (unique) one assigned during upload
 
        // Replace the original filename with the new (unique) one assigned during upload

-       jQuery('#media-item-' + fileObj.id + ' .filename.original').replaceWith(jQuery('#media-item-' + fileObj.id + ' .filename.new'));
+       jQuery('.filename.original', item).replaceWith( jQuery('.filename.new', item) );

 
        // Also bind toggle to the links
 
        // Also bind toggle to the links

-       jQuery('#media-item-' + fileObj.id + ' a.toggle').click(function(){
-               jQuery(this).siblings('.slidetoggle').slideToggle(150, function(){
-                       var o = jQuery(this).offset();
-                       window.scrollTo(0, o.top-36);
+       jQuery('a.toggle', item).click(function(){
+               jQuery(this).siblings('.slidetoggle').slideToggle(350, function(){
+                       var w = jQuery(window).height(), t = jQuery(this).offset().top, h = jQuery(this).height(), b;
+
+                       if ( w && t && h ) {
+                b = t + h;
+
+                if ( b > w && (h + 48) < w )
+                    window.scrollBy(0, b - w + 13);
+                else if ( b > w )
+                    window.scrollTo(0, t - 36);
+            }

                });
                });

-               jQuery(this).parent().children('.toggle').toggle();
+               jQuery(this).siblings('.toggle').andSelf().toggle();

                jQuery(this).siblings('a.toggle').focus();
                return false;
        });
 
        // Bind AJAX to the new Delete button
                jQuery(this).siblings('a.toggle').focus();
                return false;
        });
 
        // Bind AJAX to the new Delete button

-       jQuery('#media-item-' + fileObj.id + ' a.delete').click(function(){
+       jQuery('a.delete', item).click(function(){

                // Tell the server to delete it. TODO: handle exceptions
                // Tell the server to delete it. TODO: handle exceptions

-               jQuery.ajax({url:'admin-ajax.php',type:'post',success:deleteSuccess,error:deleteError,id:fileObj.id,data:{
-                       id : this.id.replace(/[^0-9]/g,''),
-                       action : 'delete-post',
-                       _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')}
-                       });
+               jQuery.ajax({
+                       url: 'admin-ajax.php',
+                       type: 'post',
+                       success: deleteSuccess,
+                       error: deleteError,
+                       id: fileObj.id,
+                       data: {
+                               id : this.id.replace(/[^0-9]/g, ''),
+                               action : 'trash-post',
+                               _ajax_nonce : this.href.replace(/^.*wpnonce=/,'')
+                       }
+               });
+               return false;
+       });
+
+       // Bind AJAX to the new Undo button
+       jQuery('a.undo', item).click(function(){
+               // Tell the server to untrash it. TODO: handle exceptions
+               jQuery.ajax({
+                       url: 'admin-ajax.php',
+                       type: 'post',
+                       id: fileObj.id,
+                       data: {
+                               id : this.id.replace(/[^0-9]/g,''),
+                               action: 'untrash-post',
+                               _ajax_nonce: this.href.replace(/^.*wpnonce=/,'')
+                       },
+                       success: function(data, textStatus){
+                               var item = jQuery('#media-item-' + fileObj.id);
+
+                               if ( type = jQuery('#type-of-' + fileObj.id).val() )
+                                       jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-0+1);
+                               if ( item.hasClass('child-of-'+post_id) )
+                                       jQuery('#attachments-count').text(jQuery('#attachments-count').text()-0+1);
+
+                               jQuery('.filename .trashnotice', item).remove();
+                               jQuery('.filename .title', item).css('font-weight','normal');
+                               jQuery('a.undo', item).addClass('hidden');
+                               jQuery('a.describe-toggle-on, .menu_order_input', item).show();
+                               item.css( {backgroundColor:'#ceb'} ).animate( {backgroundColor: '#fff'}, { queue: false, duration: 500, complete: function(){ jQuery(this).css({backgroundColor:''}); } }).removeClass('undo');
+                       }
+               });

                return false;
        });
 
        // Open this item if it says to start open (e.g. to display an error)
                return false;
        });
 
        // Open this item if it says to start open (e.g. to display an error)

-       jQuery('#media-item-' + fileObj.id + '.startopen').removeClass('startopen').slideToggle(500).parent().children('.toggle').toggle();
+       jQuery('#media-item-' + fileObj.id + '.startopen').removeClass('startopen').slideToggle(500).siblings('.toggle').toggle();

 }
 
 function itemAjaxError(id, html) {
 }
 
 function itemAjaxError(id, html) {


@@ -101,27 +146,29 @@ function deleteSuccess(data, textStatus) {
        if ( data == '0' )
                return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
 
        if ( data == '0' )
                return itemAjaxError(this.id, 'Could not be deleted. Has it been deleted already?');
 

-       var item = jQuery('#media-item-' + this.id);
+       var id = this.id, item = jQuery('#media-item-' + id);

 
        // Decrement the counters.
 
        // Decrement the counters.

-       if ( type = jQuery('#type-of-' + this.id).val() )
-               jQuery('#' + type + '-counter').text(jQuery('#' + type + '-counter').text()-1);
+       if ( type = jQuery('#type-of-' + id).val() )
+               jQuery('#' + type + '-counter').text( jQuery('#' + type + '-counter').text() - 1 );

        if ( item.hasClass('child-of-'+post_id) )
        if ( item.hasClass('child-of-'+post_id) )

-               jQuery('#attachments-count').text(jQuery('#attachments-count').text()-1);
+               jQuery('#attachments-count').text( jQuery('#attachments-count').text() - 1 );

 
 

-       if ( jQuery('.type-form #media-items>*').length == 1 && jQuery('#media-items .hidden').length > 0 ) {
+       if ( jQuery('form.type-form #media-items').children().length == 1 && jQuery('.hidden', '#media-items').length > 0 ) {

                jQuery('.toggle').toggle();
                jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
        }
 
        // Vanish it.
                jQuery('.toggle').toggle();
                jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden');
        }
 
        // Vanish it.

-       jQuery('#media-item-' + this.id + ' .filename:empty').remove();
-       jQuery('#media-item-' + this.id + ' .filename').append(' <span class="file-error">'+swfuploadL10n.deleted+'</span>').siblings('a.toggle').remove();
-       jQuery('#media-item-' + this.id).children('.describe').css({backgroundColor:'#fff'}).end()
-                       .animate({backgroundColor:'#ffc0c0'}, {queue:false,duration:50})
-                       .animate({minHeight:0,height:36}, 400, null, function(){jQuery(this).children('.describe').remove()})
-                       .animate({backgroundColor:'#fff'}, 400)
-                       .animate({height:0}, 800, null, function(){jQuery(this).remove();updateMediaForm();});
+       jQuery('.toggle', item).toggle();
+       jQuery('.slidetoggle', item).slideUp(200).siblings().removeClass('hidden');
+       item.css( {backgroundColor:'#faa'} ).animate( {backgroundColor:'#f4f4f4'}, {queue:false, duration:500} ).addClass('undo');
+
+       jQuery('.filename:empty', item).remove();
+       jQuery('.filename .title', item).css('font-weight','bold');
+       jQuery('.filename', item).append('<span class="trashnotice"> ' + swfuploadL10n.deleted + ' </span>').siblings('a.toggle').hide();
+       jQuery('.filename', item).append( jQuery('a.undo', item).removeClass('hidden') );
+       jQuery('.menu_order_input', item).hide();

 
        return;
 }
 
        return;
 }


@@ -131,21 +178,21 @@ function deleteError(X, textStatus, errorThrown) {
 }
 
 function updateMediaForm() {
 }
 
 function updateMediaForm() {

-       storeState();
+       var one = jQuery('form.type-form #media-items').children(), items = jQuery('#media-items').children();
+

        // Just one file, no need for collapsible part
        // Just one file, no need for collapsible part

-       if ( jQuery('.type-form #media-items>*').length == 1 ) {
-               jQuery('#media-items .slidetoggle').slideDown(500).parent().eq(0).children('.toggle').toggle();
-               jQuery('.type-form .slidetoggle').siblings().addClass('hidden');
+       if ( one.length == 1 ) {
+               jQuery('.slidetoggle', one).slideDown(500).siblings().addClass('hidden').filter('.toggle').toggle();

        }
 
        // Only show Save buttons when there is at least one file.
        }
 
        // Only show Save buttons when there is at least one file.

-       if ( jQuery('#media-items>*').not('.media-blank').length > 0 )
+       if ( items.not('.media-blank').length > 0 )

                jQuery('.savebutton').show();
        else
                jQuery('.savebutton').hide();
 
        // Only show Gallery button when there are at least two files.
                jQuery('.savebutton').show();
        else
                jQuery('.savebutton').hide();
 
        // Only show Gallery button when there are at least two files.

-       if ( jQuery('#media-items>*').length > 1 )
+       if ( items.length > 1 )

                jQuery('.insert-gallery').show();
        else
                jQuery('.insert-gallery').hide();
                jQuery('.insert-gallery').show();
        else
                jQuery('.insert-gallery').hide();


@@ -245,7 +292,7 @@ function swfuploadLoadFailed() {
 }
 
 function uploadError(fileObj, errorCode, message) {
 }
 
 function uploadError(fileObj, errorCode, message) {

-       
+

        switch (errorCode) {
                case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
                        wpFileError(fileObj, swfuploadL10n.missing_upload_url);
        switch (errorCode) {
                case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:
                        wpFileError(fileObj, swfuploadL10n.missing_upload_url);


@@ -279,38 +326,22 @@ function cancelUpload() {
 }
 
 // remember the last used image size, alignment and url
 }
 
 // remember the last used image size, alignment and url

-var storeState;
-(function($){
-
-storeState = function(){
-       var align = getUserSetting('align') || '', imgsize = getUserSetting('imgsize') || '';
-
-       $('tr.align input[type="radio"]').click(function(){
-               setUserSetting('align', $(this).val());
-       }).filter(function(){
-               if ( $(this).val() == align )
-                       return true;
-               return false;
-       }).attr('checked','checked');
-
-       $('tr.image-size input[type="radio"]').click(function(){
-               setUserSetting('imgsize', $(this).val());
-       }).filter(function(){
-               if ( $(this).attr('disabled') || $(this).val() != imgsize )
-                       return false;
-               return true;
-       }).attr('checked','checked');
-
-       $('tr.url button').click(function(){
-               var c = this.className || '';
-               c = c.replace(/.*?(url[^ '"]+).*/, '$1');
-               if (c) setUserSetting('urlbutton', c);
-               $(this).siblings('.urlfield').val( $(this).attr('title') );
+jQuery(document).ready(function($){
+       $('input[type="radio"]', '#media-items').live('click', function(){
+               var tr = $(this).closest('tr');
+
+               if ( $(tr).hasClass('align') )
+                       setUserSetting('align', $(this).val());
+               else if ( $(tr).hasClass('image-size') )
+                       setUserSetting('imgsize', $(this).val());

        });
 
        });
 

-       $('tr.url .urlfield').each(function(){
-               var b = getUserSetting('urlbutton');
-               $(this).val( $(this).siblings('button.'+b).attr('title') );
+       $('button.button', '#media-items').live('click', function(){
+               var c = this.className || '';
+               c = c.match(/url([^ '"]+)/);
+               if ( c && c[1] ) {
+                       setUserSetting('urlbutton', c[1]);
+                       $(this).siblings('.urlfield').val( $(this).attr('title') );
+               }

        });
        });

-}
-})(jQuery);
+});