From 46a353ece7d63a731ab3338d49018e97fad30246 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Wed, 7 Apr 2010 13:52:12 +0000 Subject: [PATCH] TB_iframe fixes for stuff that broke in r14015. props scribu. fixes #12878. see #12792 git-svn-id: http://svn.automattic.com/wordpress/trunk@14030 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/plugin-install.dev.js | 2 ++ wp-admin/js/plugin-install.js | 2 +- wp-admin/js/theme-preview.dev.js | 3 +++ wp-admin/js/theme-preview.js | 2 +- wp-includes/js/thickbox/thickbox.js | 6 ++++-- wp-includes/script-loader.php | 6 +++--- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/wp-admin/js/plugin-install.dev.js b/wp-admin/js/plugin-install.dev.js index 1bd26870a..2cf108141 100644 --- a/wp-admin/js/plugin-install.dev.js +++ b/wp-admin/js/plugin-install.dev.js @@ -22,6 +22,8 @@ jQuery(document).ready(function($) { }; thickDims().click( function() { + tb_click.call(this); + $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'}); $('#TB_ajaxWindowTitle').html('' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') ); return false; diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js index 10f75eb4d..def9c20c0 100644 --- a/wp-admin/js/plugin-install.js +++ b/wp-admin/js/plugin-install.js @@ -1 +1 @@ -jQuery(document).ready(function(b){var a=function(){var f=b("#TB_window"),e=b(window).width(),d=b(window).height(),c=(720"+plugininstallL10n.plugin_information+" "+b(this).attr("title"));return false});b("#plugin-information #sidemenu a").click(function(){var c=b(this).attr("name");b("#plugin-information-header a.current").removeClass("current");b(this).addClass("current");b("#section-holder div.section").hide();b("#section-"+c).show();return false});b('#install-plugins .action-links .install-now').click(function(){return confirm( plugininstallL10n.ays);});}); \ No newline at end of file +jQuery(document).ready(function($){var thickDims=function(){var tbWindow=$("#TB_window"),width=$(window).width(),H=$(window).height(),W=(720"+plugininstallL10n.plugin_information+" "+$(this).attr("title"));return false});$("#plugin-information #sidemenu a").click(function(){var tab=$(this).attr("name");$("#plugin-information-header a.current").removeClass("current");$(this).addClass("current");$("#section-holder div.section").hide();$("#section-"+tab).show();return false});$("#install-plugins .action-links .install-now").click(function(){return confirm(plugininstallL10n.ays)})}); \ No newline at end of file diff --git a/wp-admin/js/theme-preview.dev.js b/wp-admin/js/theme-preview.dev.js index 5c67e999b..b474a131c 100644 --- a/wp-admin/js/theme-preview.dev.js +++ b/wp-admin/js/theme-preview.dev.js @@ -21,6 +21,8 @@ jQuery(document).ready(function($) { $(window).resize( function() { thickDims() } ); $('a.thickbox-preview').click( function() { + tb_click.call(this); + var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text; if ( tbWidth = href.match(/&tbWidth=[0-9]+/) ) @@ -48,6 +50,7 @@ jQuery(document).ready(function($) { $('#TB_iframeContent').width('100%'); thickDims(); + return false; } ); diff --git a/wp-admin/js/theme-preview.js b/wp-admin/js/theme-preview.js index 2555af162..422dc4fdd 100644 --- a/wp-admin/js/theme-preview.js +++ b/wp-admin/js/theme-preview.js @@ -1 +1 @@ -var thickDims,tbWidth,tbHeight;jQuery(document).ready(function(a){thickDims=function(){var f=a("#TB_window"),d=a(window).height(),b=a(window).width(),c,e;c=(tbWidth&&tbWidth'+f+""}else{f=a(this).attr("title")||"";e='  '+f+""}a("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});a("#TB_closeAjaxWindow").css({"float":"left"});a("#TB_ajaxWindowTitle").css({"float":"right"}).html(e);a("#TB_iframeContent").width("100%");thickDims();return false});a(".theme-detail").click(function(){a(this).siblings(".themedetaildiv").toggle();return false})}); \ No newline at end of file +var thickDims,tbWidth,tbHeight;jQuery(document).ready(function($){thickDims=function(){var tbWindow=$("#TB_window"),H=$(window).height(),W=$(window).width(),w,h;w=(tbWidth&&tbWidth'+text+""}else{text=$(this).attr("title")||"";link='  '+text+""}$("#TB_title").css({"background-color":"#222",color:"#dfdfdf"});$("#TB_closeAjaxWindow").css({"float":"left"});$("#TB_ajaxWindowTitle").css({"float":"right"}).html(link);$("#TB_iframeContent").width("100%");thickDims();return false});$(".theme-detail").click(function(){$(this).siblings(".themedetaildiv").toggle();return false})}); \ No newline at end of file diff --git a/wp-includes/js/thickbox/thickbox.js b/wp-includes/js/thickbox/thickbox.js index ef15eeda2..b4ff03090 100644 --- a/wp-includes/js/thickbox/thickbox.js +++ b/wp-includes/js/thickbox/thickbox.js @@ -23,14 +23,16 @@ jQuery(document).ready(function(){ //add thickbox to href & area elements that have a class of .thickbox function tb_init(domChunk){ - jQuery(domChunk).live('click', function(){ + jQuery(domChunk).live('click', tb_click); +} + +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 diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index f85fda717..88472075d 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -167,7 +167,7 @@ function wp_default_scripts( &$scripts ) { $scripts->add( 'jquery-autocomplete', "/wp-includes/js/jquery/autocomplete$suffix.js", array('jquery'), '1.1' ); $scripts->add_data( 'jquery-autocomplete', 'group', 1 ); - $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20104104'); + $scripts->add( 'thickbox', "/wp-includes/js/thickbox/thickbox.js", array('jquery'), '3.1-20100407'); $scripts->add_data( 'thickbox', 'group', 1 ); $scripts->localize( 'thickbox', 'thickboxL10n', array( 'next' => __('Next >'), @@ -337,7 +337,7 @@ function wp_default_scripts( &$scripts ) { 'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};' )); - $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20090319' ); + $scripts->add( 'theme-preview', "/wp-admin/js/theme-preview$suffix.js", array( 'thickbox', 'jquery' ), '20100407' ); $scripts->add_data( 'theme-preview', 'group', 1 ); $scripts->add( 'inline-edit-post', "/wp-admin/js/inline-edit-post$suffix.js", array( 'jquery', 'suggest' ), '20091202' ); @@ -356,7 +356,7 @@ function wp_default_scripts( &$scripts ) { 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};' ) ); - $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20100402' ); + $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20100407' ); $scripts->add_data( 'plugin-install', 'group', 1 ); $scripts->localize( 'plugin-install', 'plugininstallL10n', array( 'plugin_information' => __('Plugin Information:'),