diff options
Diffstat (limited to 'wp-includes/js/tinymce/plugins/wpeditimage')
3 files changed, 7 insertions, 7 deletions
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html index a9f1c15..55554d7 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html @@ -4,11 +4,11 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title></title> -<script type="text/javascript" src="js/editimage.js?ver=311d"></script> +<script type="text/javascript" src="js/editimage.js?ver=311g"></script> <script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script> -<link rel="stylesheet" href="css/editimage.css?ver=311d" type="text/css" media="all" /> -<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta3" type="text/css" media="all" /> +<link rel="stylesheet" href="css/editimage.css?ver=311g" type="text/css" media="all" /> +<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6.1" type="text/css" media="all" /> <script type="text/javascript"> if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') ) document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311" type="text/css" media="all" />'); diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js index 7dfeca2..d0ca4ed 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js @@ -15,7 +15,7 @@ if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' ) return; - tb_show('', url + '/editimage.html?ver=311c&TB_iframe=true'); + tb_show('', url + '/editimage.html?ver=311g&TB_iframe=true'); tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); }); diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js b/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js index 1986a13..9534c64 100644 --- a/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js +++ b/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js @@ -79,7 +79,7 @@ var wpImage = { for ( i = 0; i < styles.length; i++ ) { var url = styles.item(i).href; - if ( url && url.indexOf('colors-') != -1 ) + if ( url && url.indexOf('colors') != -1 ) document.write( '<link rel="stylesheet" href="'+url+'" type="text/css" media="all" />' ); } }, @@ -245,10 +245,10 @@ var wpImage = { }, setup : function() { - var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null; + var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = ''; document.dir = tinyMCEPopup.editor.getParam('directionality',''); - if ( ! tinyMCEPopup.editor.getParam('wpeditimage_do_captions', true) ) + if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) ) t.I('cap_field').style.display = 'none'; tinyMCEPopup.restoreSelection(); |