Ticket #34130: 34130.diff

src/wp-includes/js/thickbox/thickbox.js

@@ -134 +134 @@
 
                         jQuery("#TB_closeWindowButton").click(tb_remove);
 
-                        if (!(TB_PrevHTML === "")) {
-                                function goPrev(){
-                                        if(jQuery(document).unbind("click",goPrev)){jQuery(document).unbind("click",goPrev);}
-                                        jQuery("#TB_window").remove();
-                                        jQuery("body").append("<div id='TB_window'></div>");
-                                        tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
-                                        return false;
-                                }
-                                jQuery("#TB_prev").click(goPrev);
+                        function goPrev(){
+                                if(jQuery(document).unbind("click",goPrev)){jQuery(document).unbind("click",goPrev);}
+                                jQuery("#TB_window").remove();
+                                jQuery("body").append("<div id='TB_window'></div>");
+                                tb_show(TB_PrevCaption, TB_PrevURL, imageGroup);
+                                return false;
                         }
 
-                        if (!(TB_NextHTML === "")) {
-                                function goNext(){
-                                        jQuery("#TB_window").remove();
-                                        jQuery("body").append("<div id='TB_window'></div>");
-                                        tb_show(TB_NextCaption, TB_NextURL, imageGroup);
-                                        return false;
-                                }
-                                jQuery("#TB_next").click(goNext);
+                        jQuery("#TB_prev").click(goPrev);
 
+                        function goNext(){
+                                jQuery("#TB_window").remove();
+                                jQuery("body").append("<div id='TB_window'></div>");
+                                tb_show(TB_NextCaption, TB_NextURL, imageGroup);
+                                return false;
                         }
 
+                        jQuery("#TB_next").click(goNext);
+
                         jQuery(document).bind('keydown.thickbox', function(e){
                                 if ( e.which == 27 ){ // close
                                         tb_remove();
-
-                                } else if ( e.which == 190 ){ // display previous image
-                                        if(!(TB_NextHTML == "")){
-                                                jQuery(document).unbind('thickbox');
-                                                goNext();
-                                        }
-                                } else if ( e.which == 188 ){ // display next image
-                                        if(!(TB_PrevHTML == "")){
-                                                jQuery(document).unbind('thickbox');
-                                                goPrev();
-                                        }
+                                } else if ( (e.which == 190) || (e.which == 39) ){ // display next image
+                                        jQuery("#TB_next").trigger( "click" );
+                                } else if ( (e.which == 188) || (e.which == 37) ){ // display previous image
+                                        jQuery("#TB_prev").trigger( "click" );
                                 }
                                 return false;
                         });