Changeset 8290
- Timestamp:
- 07/08/2008 11:38:53 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/gears-manifest.php
r8256 r8290 146 146 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" }, 147 147 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" }, 148 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311 " },148 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311b" }, 149 149 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" }, 150 150 … … 159 159 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" }, 160 160 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" }, 161 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311 " },161 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311b" }, 162 162 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" }, 163 163 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" }, -
trunk/wp-includes/formatting.php
r8073 r8290 1125 1125 if ( empty($text) ) return apply_filters('richedit_pre', ''); 1126 1126 1127 $output = $text; 1128 $output = convert_chars($output); 1127 $output = convert_chars($text); 1129 1128 $output = wpautop($output); 1130 1131 // These must be double-escaped or planets will collide. 1132 $output = str_replace('<', '&lt;', $output); 1133 $output = str_replace('>', '&gt;', $output); 1134 1135 // These should be entities too 1136 $output = str_replace('<', '<', $output); 1137 $output = str_replace('>', '>', $output); 1138 1129 $output = htmlspecialchars($output, ENT_NOQUOTES); 1130 1139 1131 return apply_filters('richedit_pre', $output); 1140 1132 } -
trunk/wp-includes/js/tinymce/langs/wp-langs.php
r8248 r8290 435 435 s120:"' . mce_escape( __('120%') ) . '", 436 436 s130:"' . mce_escape( __('130%') ) . '", 437 caption:"' . mce_escape( __('Caption') ) . '" 437 img_title:"' . mce_escape( __('Edit Image Title') ) . '", 438 caption:"' . mce_escape( __('Edit Image Caption') ) . '" 438 439 }); 439 440 '; -
trunk/wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css
r8167 r8290 63 63 } 64 64 65 #media-upload #basic th.label { 66 padding: 5px 5px 5px 0; 67 } 68 65 69 .show-align { 66 70 height: 200px; -
trunk/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
r8204 r8290 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 " type="text/css" media="all" />10 <link rel="stylesheet" href="css/editimage.css?ver=311b" type="text/css" media="all" /> 11 11 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6-beta1" type="text/css" media="all" /> 12 12 <script type="text/javascript"> … … 78 78 <th valign="top" scope="row" class="label"> 79 79 <label for="img_title"> 80 <span class="alignleft">{#advanced_dlg.link_titlefield}</span> 81 <span class="alignright"><abbr title="required" class="required">*</abbr></span> 80 <span class="alignleft">{#wpeditimage.img_title}</span> 82 81 </label> 83 82 </th> -
trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
r8260 r8290 16 16 return; 17 17 18 tb_show('', url + '/editimage.html? TB_iframe=true');18 tb_show('', url + '/editimage.html?ver=311b&TB_iframe=true'); 19 19 tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' ); 20 20 }); … … 75 75 _do_shcode : function(co) { 76 76 return co.replace(/\[wp_caption([^\]]+)\]([\s\S]+?)\[\/wp_caption\][\s\u00a0]*/g, function(a,b,c){ 77 b = b.replace(/\\'|\\'|\\'/g, ''').replace(/\\"|\\"/g, '"'); 78 c = c.replace(/\\'|\\'/g, ''').replace(/\\"/g, '"'); 77 79 var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/align=['"]([^'"]+)/i); 78 80 var w = b.match(/width=['"]([0-9]+)/), cap = b.match(/caption=['"]([^'"]+)/i); … … 92 94 93 95 _get_shcode : function(co) { 94 return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>( [^<]+)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){96 return co.replace(/<div class="mceTemp[^"]*">\s*<dl([^>]+)>\s*<dt[^>]+>([\s\S]+?)<\/dt>\s*<dd[^>]+>(.+?)<\/dd>\s*<\/dl>\s*<\/div>\s*/gi, function(a,b,c,cap){ 95 97 var id = b.match(/id=['"]([^'"]+)/i), cls = b.match(/class=['"]([^'"]+)/i); 96 98 var w = c.match(/width=['"]([0-9]+)/); … … 102 104 if ( ! w || ! cap ) return c; 103 105 cls = cls.match(/align[^ '"]+/) || 'alignnone'; 106 cap = cap.replace(/<\S[^<>]*>/gi, '').replace(/'/g, ''').replace(/"/g, '"'); 104 107 105 108 return '[wp_caption id="'+id+'" align="'+cls+'" width="'+w+'" caption="'+cap+'"]'+c+'[/wp_caption]'; -
trunk/wp-includes/js/tinymce/tiny_mce_config.php
r8260 r8290 223 223 if ( $disk_cache ) { 224 224 225 $cacheKey = apply_filters('tiny_mce_version', '2008070 6');225 $cacheKey = apply_filters('tiny_mce_version', '20080708'); 226 226 227 227 foreach ( $initArray as $v ) -
trunk/wp-includes/script-loader.php
r8262 r8290 38 38 39 39 // Modify this version when tinyMCE plugins are changed. 40 $mce_version = apply_filters('tiny_mce_version', '2008070 6');40 $mce_version = apply_filters('tiny_mce_version', '20080708'); 41 41 $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version ); 42 42
Note: See TracChangeset
for help on using the changeset viewer.