X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/78ff9d91a14da1f53bd3f1ffcab1264d92359b72..refs/tags/wordpress-3.8.2:/wp-content/plugins/akismet/akismet.js

diff --git a/wp-content/plugins/akismet/akismet.js b/wp-content/plugins/akismet/akismet.js
index f3da8fd6..2db61ebf 100644
--- a/wp-content/plugins/akismet/akismet.js
+++ b/wp-content/plugins/akismet/akismet.js
@@ -1,114 +1,154 @@
-jQuery(document).ready(function () {
-	jQuery( '.switch-have-key' ).click( function() {
-		var no_key = jQuery( this ).parents().find('div.no-key');		
-		var have_key = jQuery( this ).parents().find('div.have-key');
+jQuery( function ( $ ) {
+	$( '.switch-have-key' ).click( function() {
+		var no_key = $( this ).parents().find('div.no-key');		
+		var have_key = $( this ).parents().find('div.have-key');
 		
 		no_key.addClass( 'hidden' );
 		have_key.removeClass( 'hidden' );		
 		
 		return false;
 	});
-	jQuery( 'p.need-key a' ).click( function(){
+	$( 'p.need-key a' ).click( function(){
 		document.akismet_activate.submit();
 	});
-	jQuery('.akismet-status').each(function () {
-		var thisId = jQuery(this).attr('commentid');
-		jQuery(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child');
+	$('.akismet-status').each(function () {
+		var thisId = $(this).attr('commentid');
+		$(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child');
 	});
-	jQuery('.akismet-user-comment-count').each(function () {
-		var thisId = jQuery(this).attr('commentid');
-		jQuery(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
+	$('.akismet-user-comment-count').each(function () {
+		var thisId = $(this).attr('commentid');
+		$(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
 	});
-	jQuery('#the-comment-list tr.comment .column-author a[title ^= "http://"]').each(function () {
- 		var thisTitle = jQuery(this).attr('title');
- 		    thisCommentId = jQuery(this).parents('tr:first').attr('id').split("-");
+	$('#the-comment-list').find('tr.comment, tr[id ^= "comment-"]').find('.column-author a[title ^= "http://"]').each(function () {
+ 		var thisTitle = $(this).attr('title');
+ 		    thisCommentId = $(this).parents('tr:first').attr('id').split("-");
  		
- 		jQuery(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
+ 		$(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
  		
  		if (thisTitle) {
- 			jQuery(this).after(' <a href="#" class="remove_url" commentid="'+ thisCommentId[1] +'" title="Remove this URL">x</a>');
+ 			$(this).after(
+				$( '<a href="#" class="remove_url">x</a>' )
+					.attr( 'commentid', thisCommentId[1] )
+					.attr( 'title', WPAkismet.strings['Remove this URL'] )
+			);
  		}
  	});
- 	jQuery('.remove_url').live('click', function () {
- 		var thisId = jQuery(this).attr('commentid');
+ 	$('.remove_url').live('click', function () {
+ 		var thisId = $(this).attr('commentid');
  		var data = {
  			action: 'comment_author_deurl',
 			_wpnonce: WPAkismet.comment_author_url_nonce,
  			id: thisId
  		};
- 		jQuery.ajax({
+ 		$.ajax({
 		    url: ajaxurl,
 		    type: 'POST',
 		    data: data,
 		    beforeSend: function () {
 		        // Removes "x" link
-	 			jQuery("a[commentid='"+ thisId +"']").hide();
+	 			$("a[commentid='"+ thisId +"']").hide();
 	 			// Show temp status
-		        jQuery("#author_comment_url_"+ thisId).html('<span>Removing...</span>');
+		        $("#author_comment_url_"+ thisId).html( $( '<span/>' ).text( WPAkismet.strings['Removing...'] ) );
 		    },
 		    success: function (response) {
 		        if (response) {
 	 				// Show status/undo link
-	 				jQuery("#author_comment_url_"+ thisId).attr('cid', thisId).addClass('akismet_undo_link_removal').html('<span>URL removed (</span>undo<span>)</span>');
-	 			}
+	 				$("#author_comment_url_"+ thisId)
+						.attr('cid', thisId)
+						.addClass('akismet_undo_link_removal')
+						.html(
+							$( '<span/>' ).text( WPAkismet.strings['URL removed'] )
+						)
+						.append( ' ' )
+						.append(
+							$( '<span/>' )
+								.text( WPAkismet.strings['(undo)'] )
+								.addClass( 'akismet-span-link' )
+						);
+				}
 		    }
 		});
 
  		return false;
  	});
- 	jQuery('.akismet_undo_link_removal').live('click', function () {
- 		var thisId = jQuery(this).attr('cid');
-		var thisUrl = jQuery(this).attr('href').replace("http://www.", "").replace("http://", "");
+ 	$('.akismet_undo_link_removal').live('click', function () {
+ 		var thisId = $(this).attr('cid');
+		var thisUrl = $(this).attr('href').replace("http://www.", "").replace("http://", "");
  		var data = {
  			action: 'comment_author_reurl',
 			_wpnonce: WPAkismet.comment_author_url_nonce,
  			id: thisId,
  			url: thisUrl
  		};
-		jQuery.ajax({
+		$.ajax({
 		    url: ajaxurl,
 		    type: 'POST',
 		    data: data,
 		    beforeSend: function () {
 	 			// Show temp status
-		        jQuery("#author_comment_url_"+ thisId).html('<span>Re-adding…</span>');
+		        $("#author_comment_url_"+ thisId).html( $( '<span/>' ).text( WPAkismet.strings['Re-adding...'] ) );
 		    },
 		    success: function (response) {
 		        if (response) {
 	 				// Add "x" link
-					jQuery("a[commentid='"+ thisId +"']").show();
+					$("a[commentid='"+ thisId +"']").show();
 					// Show link
-					jQuery("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').html(thisUrl);
+					$("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').html(thisUrl);
 	 			}
 		    }
 		});
  		
  		return false;
  	});
- 	jQuery('a[id^="author_comment_url"]').mouseover(function () {
+	$('a[id^="author_comment_url"], tr.pingback td.column-author a:first-of-type').mouseover(function () {
 		var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
 		// Need to determine size of author column
-		var thisParentWidth = jQuery(this).parent().width();
+		var thisParentWidth = $(this).parent().width();
 		// It changes based on if there is a gravatar present
-		thisParentWidth = (jQuery(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
-		if (jQuery(this).find('.mShot').length == 0 && !jQuery(this).hasClass('akismet_undo_link_removal')) {
-			var thisId = jQuery(this).attr('id').replace('author_comment_url_', '');
-			jQuery('.widefat td').css('overflow', 'visible');
-			jQuery(this).css('position', 'relative');
-			var thisHref = jQuery.URLEncode(jQuery(this).attr('href'));
-			jQuery(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="'+wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image_'+thisId+'" style="margin: 0;" /></div>');
+		thisParentWidth = ($(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
+		if ($(this).find('.mShot').length == 0 && !$(this).hasClass('akismet_undo_link_removal')) {
+			var self = $( this );
+			$('.widefat td').css('overflow', 'visible');
+			$(this).css('position', 'relative');
+			var thisHref = $.URLEncode( $(this).attr('href') );
+			$(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image" style="margin: 0;" /></div>');
 			setTimeout(function () {
-				jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
+				self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
 			}, 6000);
 			setTimeout(function () {
-				jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
+				self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
 			}, 12000);
 		} else {
-			jQuery(this).find('.mShot').css('left', thisParentWidth).show();
+			$(this).find('.mShot').css('left', thisParentWidth).show();
 		}
 	}).mouseout(function () {
-		jQuery(this).find('.mShot').hide();
+		$(this).find('.mShot').hide();
 	});
+	$('.checkforspam:not(.button-disabled)').click( function(e) { 
+ 	    $('.checkforspam:not(.button-disabled)').addClass('button-disabled'); 
+ 		$('.checkforspam-spinner').show(); 
+ 		akismet_check_for_spam(0, 100); 
+ 		e.preventDefault(); 
+ 	});
+	
+	function akismet_check_for_spam(offset, limit) { 
+		$.post( 
+			ajaxurl, 
+			{ 
+				'action': 'akismet_recheck_queue', 
+				'offset': offset, 
+				'limit': limit 
+			}, 
+			function(result) { 
+				if (result.processed < limit) { 
+					window.location.reload(); 
+				} 
+				else { 
+					akismet_check_for_spam(offset + limit, limit); 
+				} 
+			} 
+		); 
+	}
 });
 // URL encode plugin
 jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a-zA-Z0-9_.]*)/;
@@ -117,10 +157,3 @@ jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a
     }else{if(c[x]==' ')o+='+';else{var d=c.charCodeAt(x);var h=d.toString(16);
     o+='%'+(h.length<2?'0':'')+h.toUpperCase();}x++;}}return o;}
 });
-// Preload mshot images after everything else has loaded
-jQuery(window).load(function() {
-	var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
-	jQuery('a[id^="author_comment_url"]').each(function () {
-		jQuery.get(wpcomProtocol+'s0.wordpress.com/mshots/v1/'+jQuery.URLEncode(jQuery(this).attr('href'))+'?w=450');
-	});
-});