Changeset 12205

Timestamp:

11/18/2009 12:19:55 AM (17 years ago)

Author:

azaozz

Message:

Let plugins predefine thickbox image vars, props aaroncampbell, fixes #6453

Location:

trunk/wp-includes

Files:

• js/thickbox/thickbox.js (modified) (17 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/thickbox/thickbox.js

@@ -5 +5 @@
  * 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 = "../wp-includes/js/thickbox/loadingAnimation.gif";
+}
+if ( typeof tb_closeImage != 'string' ) {
+        var tb_closeImage = "../wp-includes/js/thickbox/tb-close.png";
+}
 
 /*!!!!!!!!!!!!!!!!! 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
@@ -46 +50 @@
                         }
                 }
-                
+
                 if(tb_detectMacXFF()){
                         jQuery("#TB_overlay").addClass("TB_overlayMacFFBGHack");//use png overlay so hide flash
@@ -52 +56 @@
                         jQuery("#TB_overlay").addClass("TB_overlayBG");//use background and opacity
                 }
-                
+
                 if(caption===null){caption="";}
                 jQuery("body").append("<div id='TB_load'><img src='"+imgLoader.src+"' /></div>");//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 = "";
@@ -81 +85 @@
                                 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;
@@ -93 +97 @@
                                                 } else {
                                                         TB_FoundURL = true;
-                                                        TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length);                                                                                     
+                                                        TB_imageCount = "Image " + (TB_Counter + 1) +" of "+ (TB_TempArray.length);
                                                 }
                                 }
@@ -99 +103 @@
 
                         imgPreloader = new Image();
-                        imgPreloader.onload = function(){               
+                        imgPreloader.onload = function(){
                         imgPreloader.onload = null;
-                                
+
                         // Resizing large images - orginal by Christian Montoya edited by me.
                         var pagesize = tb_getPageSize();
@@ -109 +113 @@
                         var imageHeight = imgPreloader.height;
                         if (imageWidth > x) {
-                                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); 
+                                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);
                                         imageWidth = x;
                                 }
                         }
                         // End Resizing
-                        
+
                         TB_WIDTH = imageWidth + 30;
                         TB_HEIGHT = imageHeight + 60;
-                        jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'><img src='" + tb_closeImage + "' /></a></div>");          
-                        
+                        jQuery("#TB_window").append("<a href='' id='TB_ImageOff' title='Close'><img id='TB_Image' src='"+url+"' width='"+imageWidth+"' height='"+imageHeight+"' alt='"+caption+"'/></a>" + "<div id='TB_caption'>"+caption+"<div id='TB_secondLine'>" + TB_imageCount + TB_PrevHTML + TB_NextHTML + "</div></div><div id='TB_closeWindow'><a href='#' id='TB_closeWindowButton' title='Close'><img src='" + tb_closeImage + "' /></a></div>");
+
                         jQuery("#TB_closeWindowButton").click(tb_remove);
-                        
+
                         if (!(TB_PrevHTML === "")) {
                                 function goPrev(){
@@ -137 +141 @@
                                         jQuery("body").append("<div id='TB_window'></div>");
                                         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("<div id='TB_window'></div>");
-                                        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;
@@ -171 +175 @@
                                                 goPrev();
                                         }
-                                }       
+                                }
                         };
-                        
+
                         tb_position();
                         jQuery("#TB_load").remove();
@@ -179 +183 @@
                         jQuery("#TB_window").css({display:"block"}); //for safari using css instead of show
                         };
-                        
+
                         imgPreloader.src = url;
                 }else{//code to show html
-                        
+
                         var queryString = url.replace(/^[^\?]+\??/,'');
                         var params = tb_parseQuery( queryString );
@@ -190 +194 @@
                         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();
@@ -206 +210 @@
                                                 }else{//ajax modal
                                                 jQuery("#TB_overlay").unbind();
-                                                jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");    
+                                                jQuery("#TB_window").append("<div id='TB_ajaxContent' class='TB_modal' style='width:"+ajaxContentW+"px;height:"+ajaxContentH+"px;'></div>");
                                                 }
                                         }else{//this means the window is already up, we are just loading new content via ajax
@@ -215 +219 @@
                                         }
                         }
-                                        
+
                         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 () {
@@ -225 +229 @@
                                         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();
@@ -240 +244 @@
                                         });
                                 }
-                        
+
                 }
 
                 if(!params['modal']){
-                        document.onkeyup = function(e){         
+                        document.onkeyup = function(e){
                                 if (e == null) { // ie
                                         keycode = event.keyCode;
@@ -252 +256 @@
                                 if(keycode == 27){ // close
                                         tb_remove();
-                                }       
+                                }
                         };
                 }
-                
+
         } catch(e) {
                 //nothing here
@@ -318 +322 @@
   }
 }
-
-

trunk/wp-includes/script-loader.php

@@ -165 +165 @@
         $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-20091117');
         $scripts->add_data( 'thickbox', 'group', 1 );