Changeset 8358 for trunk/wp-includes/js
- Timestamp:
- 07/16/08 21:36:17 (1 month ago)
- Files:
-
- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html (modified) (1 diff)
- trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js (modified) (1 diff)
- trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js (modified) (1 diff)
- trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
r8313 r8358 5 5 <title></title> 6 6 7 <script type="text/javascript" src="js/editimage.js?ver=311 d"></script>7 <script type="text/javascript" src="js/editimage.js?ver=311e"></script> 8 8 <script type="text/javascript" src="../../utils/form_utils.js?ver=311"></script> 9 9 10 <link rel="stylesheet" href="css/editimage.css?ver=311 d" type="text/css" media="all" />11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6 -beta3" type="text/css" media="all" />10 <link rel="stylesheet" href="css/editimage.css?ver=311e" type="text/css" media="all" /> 11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6" type="text/css" media="all" /> 12 12 <script type="text/javascript"> 13 13 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') ) trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
r8313 r8358 16 16 return; 17 17 18 tb_show('', url + '/editimage.html?ver=311 c&TB_iframe=true');18 tb_show('', url + '/editimage.html?ver=311e&TB_iframe=true'); 19 19 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); 20 20 }); trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js
r8356 r8358 249 249 document.dir = tinyMCEPopup.editor.getParam('directionality',''); 250 250 251 if ( ! tinyMCEPopup.editor.getParam('wpeditimage_do_captions', true) )251 if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) ) 252 252 t.I('cap_field').style.display = 'none'; 253 253 trunk/wp-includes/js/tinymce/tiny_mce_config.php
r8313 r8358 131 131 $mce_buttons_4 = implode($mce_buttons_4, ','); 132 132 133 $ do_captions = ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) ? false : true;133 $no_captions = ( apply_filters( 'disable_captions', '' ) ) ? true : false; 134 134 135 135 // TinyMCE init settings … … 166 166 'content_css' => "$mce_css", 167 167 'save_callback' => 'switchEditors.saveCallback', 168 'wpeditimage_d o_captions' => $do_captions,168 'wpeditimage_disable_captions' => $no_captions, 169 169 'plugins' => "$plugins", 170 170 // pass-through the settings for compression and caching, so they can be changed with "tiny_mce_before_init" … … 226 226 if ( $disk_cache ) { 227 227 228 $cacheKey = apply_filters('tiny_mce_version', '2008071 0');228 $cacheKey = apply_filters('tiny_mce_version', '20080712'); 229 229 230 230 foreach ( $initArray as $v )
