Index: wp-includes/js/thickbox/thickbox.js =================================================================== --- wp-includes/js/thickbox/thickbox.js (revision 11666) +++ wp-includes/js/thickbox/thickbox.js (working copy) @@ -11,7 +11,7 @@ /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/ //on page load call tb_init -jQuery(document).ready(function(){ +jQuery(document).ready(function(){ tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox imgLoader = new Image();// preload image imgLoader.src = tb_pathToImage; @@ -59,7 +59,7 @@ var baseURL; if(url.indexOf("?")!==-1){ //ff there is a query string involved baseURL = url.substr(0, url.indexOf("?")); - }else{ + }else{ baseURL = url; } @@ -80,25 +80,25 @@ TB_TempArray = jQuery("a[rel="+imageGroup+"]").get(); for (TB_Counter = 0; ((TB_Counter < TB_TempArray.length) && (TB_NextHTML === "")); TB_Counter++) { var urlTypeTemp = TB_TempArray[TB_Counter].href.toLowerCase().match(urlString); - if (!(TB_TempArray[TB_Counter].href == url)) { + if (!(TB_TempArray[TB_Counter].href == url)) { if (TB_FoundURL) { TB_NextCaption = TB_TempArray[TB_Counter].title; TB_NextURL = TB_TempArray[TB_Counter].href; - TB_NextHTML = "  Next >"; + TB_NextHTML = "  "+thickboxL10n.next+""; } else { TB_PrevCaption = TB_TempArray[TB_Counter].title; TB_PrevURL = TB_TempArray[TB_Counter].href; - TB_PrevHTML = "  < Prev"; + TB_PrevHTML = "  "+thickboxL10n.prev+""; } } else { TB_FoundURL = true; - TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length); + TB_imageCount = thickboxL10n.image+" " + (TB_Counter + 1) +" of "+ (TB_TempArray.length); } } } imgPreloader = new Image(); - imgPreloader.onload = function(){ + imgPreloader.onload = function(){ imgPreloader.onload = null; // Resizing large images - orginal by Christian Montoya edited by me. @@ -108,17 +108,17 @@ var imageWidth = imgPreloader.width; var imageHeight = imgPreloader.height; if (imageWidth > x) { - imageHeight = imageHeight * (x / imageWidth); - imageWidth = x; - if (imageHeight > y) { - imageWidth = imageWidth * (y / imageHeight); - imageHeight = y; + imageHeight = imageHeight * (x / imageWidth); + imageWidth = x; + if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; } - } else if (imageHeight > y) { - imageWidth = imageWidth * (y / imageHeight); - imageHeight = y; - if (imageWidth > x) { - imageHeight = imageHeight * (x / imageWidth); + } else if (imageHeight > y) { + imageWidth = imageWidth * (y / imageHeight); + imageHeight = y; + if (imageWidth > x) { + imageHeight = imageHeight * (x / imageWidth); imageWidth = x; } } @@ -126,7 +126,7 @@ TB_WIDTH = imageWidth + 30; TB_HEIGHT = imageHeight + 60; - jQuery("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
"); + jQuery("#TB_window").append(""+caption+"" + "
"+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
"); jQuery("#TB_closeWindowButton").click(tb_remove); @@ -136,23 +136,23 @@ jQuery("#TB_window").remove(); jQuery("body").append("
"); tb_show(TB_PrevCaption, TB_PrevURL, imageGroup); - return false; + return false; } jQuery("#TB_prev").click(goPrev); } - if (!(TB_NextHTML === "")) { + if (!(TB_NextHTML === "")) { function goNext(){ jQuery("#TB_window").remove(); jQuery("body").append("
"); - tb_show(TB_NextCaption, TB_NextURL, imageGroup); - return false; + tb_show(TB_NextCaption, TB_NextURL, imageGroup); + return false; } jQuery("#TB_next").click(goNext); } - document.onkeydown = function(e){ + document.onkeydown = function(e){ if (e == null) { // ie keycode = event.keyCode; } else { // mozilla @@ -170,7 +170,7 @@ document.onkeydown = ""; goPrev(); } - } + } }; tb_position(); @@ -194,7 +194,7 @@ urlNoQuery = url.split('TB_'); jQuery("#TB_iframeContent").remove(); if(params['modal'] != "true"){//iframe no modal - jQuery("#TB_window").append("
"+caption+"
"); + jQuery("#TB_window").append("
"+caption+"
"); }else{//iframe modal jQuery("#TB_overlay").unbind(); jQuery("#TB_window").append(""); @@ -205,7 +205,7 @@ jQuery("#TB_window").append("
"+caption+"
"); }else{//ajax modal jQuery("#TB_overlay").unbind(); - jQuery("#TB_window").append("
"); + jQuery("#TB_window").append("
"); } }else{//this means the window is already up, we are just loading new content via ajax jQuery("#TB_ajaxContent")[0].style.width = ajaxContentW +"px"; @@ -217,14 +217,14 @@ jQuery("#TB_closeWindowButton").click(tb_remove); - if(url.indexOf('TB_inline') != -1){ + if(url.indexOf('TB_inline') != -1){ jQuery("#TB_ajaxContent").append(jQuery('#' + params['inlineId']).children()); jQuery("#TB_window").unload(function () { jQuery('#' + params['inlineId']).append( jQuery("#TB_ajaxContent").children() ); // move elements back when you're finished }); tb_position(); jQuery("#TB_load").remove(); - jQuery("#TB_window").css({display:"block"}); + jQuery("#TB_window").css({display:"block"}); }else if(url.indexOf('TB_iframe') != -1){ tb_position(); if($.browser.safari){//safari needs help because it will not fire iframe onload @@ -243,7 +243,7 @@ } if(!params['modal']){ - document.onkeyup = function(e){ + document.onkeyup = function(e){ if (e == null) { // ie keycode = event.keyCode; } else { // mozilla @@ -251,7 +251,7 @@ } if(keycode == 27){ // close tb_remove(); - } + } }; } @@ -316,6 +316,4 @@ if (userAgent.indexOf('mac') != -1 && userAgent.indexOf('firefox')!=-1) { return true; } -} - - +} \ No newline at end of file Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 11666) +++ wp-includes/script-loader.php (working copy) @@ -164,8 +164,16 @@ $scripts->add( 'jquery-table-hotkeys', "/wp-includes/js/jquery/jquery.table-hotkeys$suffix.js", array('jquery', 'jquery-hotkeys'), '20090102' ); $scripts->add_data( 'jquery-table-hotkeys', 'group', 1 ); - $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20090123'); + $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20090629'); $scripts->add_data( 'thickbox', 'group', 1 ); + $scripts->localize( 'thickbox', 'thickboxL10n', array( + 'next' => __('Next >'), + 'prev' => __('< Prev'), + 'image' => __('Image'), + 'close' => __('Close'), + 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};' + ) ); + $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8');