diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-19 16:06:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-19 16:06:15 +0000 |
| commit | ae484584028c752efb5faa4c02259556e853d26e (patch) | |
| tree | ef88d82a06a9226b332b74b013b4d85a896852b0 /wp-includes/js | |
| parent | 882678aa9ed2d369d1a4c66696df002f44aae889 (diff) | |
| download | wordpress-mu-ae484584028c752efb5faa4c02259556e853d26e.tar.gz wordpress-mu-ae484584028c752efb5faa4c02259556e853d26e.tar.xz wordpress-mu-ae484584028c752efb5faa4c02259556e853d26e.zip | |
WP Merge to 4197
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@761 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/js')
| -rw-r--r-- | wp-includes/js/scriptaculous/prototype.js | 6 | ||||
| -rw-r--r-- | wp-includes/js/tinymce/tiny_mce_config.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/wp-includes/js/scriptaculous/prototype.js b/wp-includes/js/scriptaculous/prototype.js index 0caf9cd..76846d2 100644 --- a/wp-includes/js/scriptaculous/prototype.js +++ b/wp-includes/js/scriptaculous/prototype.js @@ -1765,7 +1765,9 @@ Object.extend(Event, { if (element.removeEventListener) { element.removeEventListener(name, observer, useCapture); } else if (element.detachEvent) { - element.detachEvent('on' + name, observer); + try { + element.detachEvent('on' + name, observer); + } catch (e) {} } } }); @@ -2003,4 +2005,4 @@ if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) { return [valueL, valueT]; } -}
\ No newline at end of file +} diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php index 283ffb8..dad3aff 100644 --- a/wp-includes/js/tinymce/tiny_mce_config.php +++ b/wp-includes/js/tinymce/tiny_mce_config.php @@ -21,7 +21,7 @@ } // Set up init variables - $valid_elements = 'p/-div[*],-b[*],-font[*],-ul[*],-ol[*],-li[*],*[*]'; + $valid_elements = 'p/-div[*],-strong/-b[*],-em/-i[*],-font[*],-ul[*],-ol[*],-li[*],*[*]'; $valid_elements = apply_filters('mce_valid_elements', $valid_elements); $plugins = array('inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress'); |