diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-03 17:00:59 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-03 17:00:59 +0000 |
| commit | 2b6348978ec434e2fa4114085783cf9ada097b22 (patch) | |
| tree | a3745bb9ace00b0a8f687bc8c1bfb74bb885077c /wp-admin/js | |
| parent | 102dc1d903d95fd7abdf2243d7e047b4b20099d3 (diff) | |
| download | wordpress-mu-2b6348978ec434e2fa4114085783cf9ada097b22.tar.gz wordpress-mu-2b6348978ec434e2fa4114085783cf9ada097b22.tar.xz wordpress-mu-2b6348978ec434e2fa4114085783cf9ada097b22.zip | |
WP Merge to rev 8249
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1347 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/js')
| -rw-r--r-- | wp-admin/js/editor.js | 4 | ||||
| -rw-r--r-- | wp-admin/js/media-upload.js | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/wp-admin/js/editor.js b/wp-admin/js/editor.js index 50955c7..d2049e4 100644 --- a/wp-admin/js/editor.js +++ b/wp-admin/js/editor.js @@ -52,6 +52,7 @@ switchEditors = { // Fix some block element newline issues content = content.replace(new RegExp('\\s*<div', 'mg'), '\n<div'); content = content.replace(new RegExp('</div>\\s*', 'mg'), '</div>\n'); + content = content.replace(new RegExp('\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*', 'gi'), '\n\n[wp_caption$1[/wp_caption]\n\n'); var blocklist2 = 'blockquote|ul|ol|li|table|thead|tr|th|td|h[1-6]|pre'; content = content.replace(new RegExp('\\s*<(('+blocklist2+') ?[^>]*)\\s*>', 'mg'), '\n<$1>'); @@ -69,7 +70,7 @@ switchEditors = { // Trim whitespace content = content.replace(new RegExp('^\\s*', ''), ''); - content = content.replace(new RegExp('\\s*$', ''), ''); + content = content.replace(new RegExp('[\\s\\u00a0]*$', ''), ''); // put back the line breaks in pre|script content = content.replace(/<wp_temp>/g, '\n'); @@ -164,6 +165,7 @@ switchEditors = { pee = pee.replace(new RegExp('\\s*\\n', 'gi'), "<br />\n"); pee = pee.replace(new RegExp('(</?(?:'+blocklist+')[^>]*>)\\s*<br />', 'gi'), "$1"); pee = pee.replace(new RegExp('<br />(\\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)>)', 'gi'), '$1'); + pee = pee.replace(new RegExp('(?:<p>|<br ?/?>)*\\s*\\[wp_caption([^\\[]+)\\[/wp_caption\\]\\s*(?:</p>|<br ?/?>)*', 'gi'), '[wp_caption$1[/wp_caption]'); // pee = pee.replace(new RegExp('^((?: )*)\\s', 'mg'), '$1 '); // Fix the pre|script tags diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js index 99acd26..3a034ac 100644 --- a/wp-admin/js/media-upload.js +++ b/wp-admin/js/media-upload.js @@ -5,6 +5,9 @@ function send_to_editor(h) { if (tinymce.isIE) ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark); + if ( h.indexOf('[wp_caption') != -1 ) + h = ed.plugins.wpeditimage._do_shcode(h); + ed.execCommand('mceInsertContent', false, h); } else edInsertContent(edCanvas, h); |