X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..607b7e02d77e7326161e8ec15639052d2040f745:/wp-includes/js/thickbox/thickbox.js
diff --git a/wp-includes/js/thickbox/thickbox.js b/wp-includes/js/thickbox/thickbox.js
index f2873c91..391fd418 100644
--- a/wp-includes/js/thickbox/thickbox.js
+++ b/wp-includes/js/thickbox/thickbox.js
@@ -4,70 +4,83 @@
* Copyright (c) 2007 cody lindley
* Licensed under the MIT License: http://www.opensource.org/licenses/mit-license.php
*/
-
-var tb_pathToImage = "../wp-includes/js/thickbox/loadingAnimation.gif";
-var tb_closeImage = "../wp-includes/js/thickbox/tb-close.png";
+
+if ( typeof tb_pathToImage != 'string' ) {
+ var tb_pathToImage = thickboxL10n.loadingAnimation;
+}
/*!!!!!!!!!!!!!!!!! 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;
});
-//add thickbox to href & area elements that have a class of .thickbox
+/*
+ * Add thickbox to href & area elements that have a class of .thickbox.
+ * Remove the loading indicator when content in an iframe has loaded.
+ */
function tb_init(domChunk){
- jQuery(domChunk).click(function(){
+ jQuery( 'body' )
+ .on( 'click', domChunk, tb_click )
+ .on( 'thickbox:iframe:loaded', function() {
+ jQuery( '#TB_window' ).removeClass( 'thickbox-loading' );
+ });
+}
+
+function tb_click(){
var t = this.title || this.name || null;
var a = this.href || this.alt;
var g = this.rel || false;
tb_show(t,a,g);
this.blur();
return false;
- });
}
function tb_show(caption, url, imageGroup) {//function called when the user clicks on a thickbox link
+ var $closeBtn;
+
try {
if (typeof document.body.style.maxHeight === "undefined") {//if IE 6
jQuery("body","html").css({height: "100%", width: "100%"});
jQuery("html").css("overflow","hidden");
if (document.getElementById("TB_HideSelect") === null) {//iframe to hide select elements in ie6
- jQuery("body").append("
");
+ jQuery("body").append("
");
jQuery("#TB_overlay").click(tb_remove);
}
}else{//all others
if(document.getElementById("TB_overlay") === null){
- jQuery("body").append("
");
+ jQuery("body").append("
");
jQuery("#TB_overlay").click(tb_remove);
+ jQuery( 'body' ).addClass( 'modal-open' );
}
}
-
+
if(tb_detectMacXFF()){
jQuery("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash
}else{
jQuery("#TB_overlay").addClass("TB_overlayBG");//use background and opacity
}
-
+
if(caption===null){caption="";}
- jQuery("body").append(" ");//add loader to the page
+ jQuery("body").append(" ");//add loader to the page
jQuery('#TB_load').show();//show loader
-
+
var baseURL;
if(url.indexOf("?")!==-1){ //ff there is a query string involved
baseURL = url.substr(0, url.indexOf("?"));
- }else{
+ }else{
baseURL = url;
}
-
+
var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$/;
var urlType = baseURL.toLowerCase().match(urlString);
if(urlType == '.jpg' || urlType == '.jpeg' || urlType == '.png' || urlType == '.gif' || urlType == '.bmp'){//code to show images
-
+
TB_PrevCaption = "";
TB_PrevURL = "";
TB_PrevHTML = "";
@@ -77,135 +90,132 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
TB_imageCount = "";
TB_FoundURL = false;
if(imageGroup){
- TB_TempArray = jQuery("a[@rel="+imageGroup+"]").get();
+ 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) + ' ' + thickboxL10n.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.
+
+ // Resizing large images - original by Christian Montoya edited by me.
var pagesize = tb_getPageSize();
var x = pagesize[0] - 150;
var y = pagesize[1] - 150;
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;
}
}
// End Resizing
-
+
TB_WIDTH = imageWidth + 30;
TB_HEIGHT = imageHeight + 60;
- jQuery("#TB_window").append(" " + ""+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
");
-
+ jQuery("#TB_window").append(""+thickboxL10n.close+" " + ""+caption+"
" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "
"+thickboxL10n.close+"
");
+
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("
");
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){
- if (e == null) { // ie
- keycode = event.keyCode;
- } else { // mozilla
- keycode = e.which;
- }
- if(keycode == 27){ // close
+ jQuery(document).bind('keydown.thickbox', function(e){
+ if ( e.which == 27 ){ // close
tb_remove();
- } else if(keycode == 190){ // display previous image
+
+ } else if ( e.which == 190 ){ // display previous image
if(!(TB_NextHTML == "")){
- document.onkeydown = "";
+ jQuery(document).unbind('thickbox');
goNext();
}
- } else if(keycode == 188){ // display next image
+ } else if ( e.which == 188 ){ // display next image
if(!(TB_PrevHTML == "")){
- document.onkeydown = "";
+ jQuery(document).unbind('thickbox');
goPrev();
}
- }
- };
-
+ }
+ return false;
+ });
+
tb_position();
jQuery("#TB_load").remove();
jQuery("#TB_ImageOff").click(tb_remove);
- jQuery("#TB_window").css({display:"block"}); //for safari using css instead of show
+ jQuery("#TB_window").css({'visibility':'visible'}); //for safari using css instead of show
};
-
+
imgPreloader.src = url;
}else{//code to show html
-
+
var queryString = url.replace(/^[^\?]+\??/,'');
var params = tb_parseQuery( queryString );
- TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no paramaters were added to URL
- TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no paramaters were added to URL
+ TB_WIDTH = (params['width']*1) + 30 || 630; //defaults to 630 if no parameters were added to URL
+ TB_HEIGHT = (params['height']*1) + 40 || 440; //defaults to 440 if no parameters were added to URL
ajaxContentW = TB_WIDTH - 30;
ajaxContentH = TB_HEIGHT - 45;
-
- if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window
+
+ if(url.indexOf('TB_iframe') != -1){// either iframe or ajax window
urlNoQuery = url.split('TB_');
jQuery("#TB_iframeContent").remove();
if(params['modal'] != "true"){//iframe no modal
- jQuery("#TB_window").append("");
+ jQuery("#TB_window").append(""+caption+"
"+thickboxL10n.close+"
");
}else{//iframe modal
jQuery("#TB_overlay").unbind();
- jQuery("#TB_window").append("");
+ jQuery("#TB_window").append("");
}
}else{// not an iframe, ajax
- if(jQuery("#TB_window").css("display") != "block"){
+ if(jQuery("#TB_window").css("visibility") != "visible"){
if(params['modal'] != "true"){//ajax no modal
- jQuery("#TB_window").append("
");
+ jQuery("#TB_window").append(""+caption+"
"+thickboxL10n.close+"
");
}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";
@@ -214,47 +224,53 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
jQuery("#TB_ajaxWindowTitle").html(caption);
}
}
-
+
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("#TB_window").bind('tb_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({'visibility':'visible'});
}else if(url.indexOf('TB_iframe') != -1){
tb_position();
- if($.browser.safari){//safari needs help because it will not fire iframe onload
- jQuery("#TB_load").remove();
- jQuery("#TB_window").css({display:"block"});
- }
+ jQuery("#TB_load").remove();
+ jQuery("#TB_window").css({'visibility':'visible'});
}else{
- jQuery("#TB_ajaxContent").load(url += "&random=" + (new Date().getTime()),function(){//to do a post change this load method
+ var load_url = url;
+ load_url += -1 === url.indexOf('?') ? '?' : '&';
+ jQuery("#TB_ajaxContent").load(load_url += "random=" + (new Date().getTime()),function(){//to do a post change this load method
tb_position();
jQuery("#TB_load").remove();
tb_init("#TB_ajaxContent a.thickbox");
- jQuery("#TB_window").css({display:"block"});
+ jQuery("#TB_window").css({'visibility':'visible'});
});
}
-
+
}
if(!params['modal']){
- document.onkeyup = function(e){
- if (e == null) { // ie
- keycode = event.keyCode;
- } else { // mozilla
- keycode = e.which;
- }
- if(keycode == 27){ // close
+ jQuery(document).bind('keydown.thickbox', function(e){
+ if ( e.which == 27 ){ // close
tb_remove();
- }
- };
+ return false;
+ }
+ });
+ }
+
+ $closeBtn = jQuery( '#TB_closeWindowButton' );
+ /*
+ * If the native Close button icon is visible, move focus on the button
+ * (e.g. in the Network Admin Themes screen).
+ * In other admin screens is hidden and replaced by a different icon.
+ */
+ if ( $closeBtn.find( '.tb-close-icon' ).is( ':visible' ) ) {
+ $closeBtn.focus();
}
-
+
} catch(e) {
//nothing here
}
@@ -263,20 +279,23 @@ function tb_show(caption, url, imageGroup) {//function called when the user clic
//helper functions below
function tb_showIframe(){
jQuery("#TB_load").remove();
- jQuery("#TB_window").css({display:"block"});
+ jQuery("#TB_window").css({'visibility':'visible'}).trigger( 'thickbox:iframe:loaded' );
}
function tb_remove() {
jQuery("#TB_imageOff").unbind("click");
jQuery("#TB_closeWindowButton").unbind("click");
- jQuery("#TB_window").fadeOut("fast",function(){jQuery('#TB_window,#TB_overlay,#TB_HideSelect').trigger("unload").unbind().remove();});
+ jQuery( '#TB_window' ).fadeOut( 'fast', function() {
+ jQuery( '#TB_window, #TB_overlay, #TB_HideSelect' ).trigger( 'tb_unload' ).unbind().remove();
+ jQuery( 'body' ).trigger( 'thickbox:removed' );
+ });
+ jQuery( 'body' ).removeClass( 'modal-open' );
jQuery("#TB_load").remove();
if (typeof document.body.style.maxHeight == "undefined") {//if IE 6
jQuery("body","html").css({height: "auto", width: "auto"});
jQuery("html").css("overflow","");
}
- document.onkeydown = "";
- document.onkeyup = "";
+ jQuery(document).unbind('.thickbox');
return false;
}
@@ -317,5 +336,3 @@ function tb_detectMacXFF() {
return true;
}
}
-
-