Changeset 7173

Timestamp:

03/06/08 19:56:02 (9 months ago)

Author:

ryan

Message:

Added filter for changing the languages selection for the spellchecker, fixed problems with valid_elements and added filter for extended_valid_elements, update to the latest version. Props azaozz. fixes #6111

Files:

• trunk/wp-admin/js/editor.js (modified) (6 diffs)
• trunk/wp-includes/js/tinymce/langs/wp-langs.php (modified) (5 diffs)
• trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css (modified) (2 diffs)
• trunk/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/js/link.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/default/content.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css (modified) (1 diff)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css (modified) (3 diffs)
• trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css (modified) (7 diffs)
• trunk/wp-includes/js/tinymce/tiny_mce.js (modified) (1 diff)
• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (7 diffs)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/js/editor.js

@@ -3 +3 @@
-    if ( ( 'undefined' == typeof wpTinyMCEConfig ) || 'tinymce' == wpTinyMCEConfig.defaultEditor ) {
-        document.getElementById('editorcontainer').style.padding = '0px';
-tru
+fals
-    } else {
-        var H;
@@ -14 +14 @@
-
-    saveCallback : function(el, content, body) {
-
-        document.getElementById(el).style.color = '#fff';
-
-
-
-
-
-
+
-    },
-
@@ -27 +21 @@
-       // We have a TON of cleanup to do.
-
-        // content = content.replace(/\n|\r/g, ' ');
-        // Remove anonymous, empty paragraphs.
-
+ /
-
-        // Mark </p> if it has any attributes.
@@ -85 +78 @@
-            else tinyMCE.execCommand("mceAddControl", false, id);
-
- 'tinymce' 
+'tinymce'
-        } else {
-            this.edToggle(H, P);
-
-
+
-
-            ed.hide();
-            ta.value = this.pre_wpautop(ta.value);
-            qt.style.display = 'block';
-
@@ -105 +96 @@
-
-            ta.style.color = '';
-
-
+
-        }
-    },
@@ -118 +108 @@
-    },
-
- editor 
+editor
-        try {
-            editor = escape( editor.toString() );

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -134 +134 @@
-},
-fullscreen:{
-
+ (Alt+Shift+G)
-},
-media:{
@@ -152 +152 @@
-},
-spellchecker:{
-
+ (Alt+Shift+N)
-menu:"' . mce_escape( __('Spellchecker settings') ) . '",
-ignore_word:"' . mce_escape( __('Ignore word') ) . '",
@@ -186 +186 @@
-dt:"' . mce_escape( __('Definition term ') ) . '",
-dd:"' . mce_escape( __('Definition description') ) . '",
- (Ctrl+B)') ) . '
- (Ctrl+I)') ) . '
- (Ctrl+U)
-
-
-
-
-
-
-
+') ) . ' (Ctrl / Alt+Shift + B)
+') ) . ' (Ctrl / Alt+Shift + I)
+
+ (Alt+Shift+D)
+ (Alt+Shift+L)
+ (Alt+Shift+C)
+ (Alt+Shift+R)
+ (Alt+Shift+J)
+ (Alt+Shift+U)
+ (Alt+Shift+O)
-outdent_desc:"' . mce_escape( __('Outdent') ) . '",
-indent_desc:"' . mce_escape( __('Indent') ) . '",
- (Ctrl+Z)') ) . '
- (Ctrl+Y)') ) . '
-
+') ) . ' (Ctrl+Z)
+') ) . ' (Ctrl+Y)
+ (Alt+Shift+A)
-link_delta_width:"' . mce_escape( _c('0| Extra width for the link popup in pixels') ) . '",
-link_delta_height:"' . mce_escape( _c('0| Extra height for the link popup in pixels') ) . '",
-
-
+ (Alt+Shift+S)
+ (Alt+Shift+M)
-image_delta_width:"' . mce_escape( _c('0| Extra width for the image popup in pixels') ) . '",
-image_delta_height:"' . mce_escape( _c('0| Extra height for the image popup in pixels') ) . '",
@@ -224 +224 @@
-newdocument_desc:"' . mce_escape( __('New document') ) . '",
-help_desc:"' . mce_escape( __('Help') ) . '",
-
+ (Alt+Shift+Q)
-clipboard_msg:"' . mce_escape( __('Copy/Cut/Paste is not available in Mozilla and Firefox.') ) . '",
-path:"' . mce_escape( __('Path') ) . '",
@@ -391 +391 @@
-
-tinyMCE.addI18n("' . $language . '.wordpress",{
-. '
-
-
-
+ . ' (Alt+Shift+Z)
+ (Alt+Shift+T)
+ (Alt+Shift+P)
+ (Alt+Shift+H)
-wp_more_alt:"' . mce_escape( __('More...') ) . '",
-wp_page_alt:"' . mce_escape( __('Next page...') ) . '"

trunk/wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css

@@ -13 +13 @@
-.clearlooks2 .mceTop, 
-.clearlooks2 .mceTop div {
-
-
-
+   
+   
+   
-}
-.clearlooks2 .mceTop .mceLeft {
-
-
-
-
+   
+   
+   
+   
-}
-.clearlooks2 .mceTop .mceCenter {
-}
-.clearlooks2 .mceTop .mceRight {
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
-}
-.clearlooks2 .mceTop span {
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
-}
-.clearlooks2 .mceFocus .mceTop .mceLeft {
-
-
-
+   
+   
+   
-}
-.clearlooks2 .mceFocus .mceTop .mceCenter {
-}
-.clearlooks2 .mceFocus .mceTop .mceRight {
-
-
-
+   
+   
+   
-}
-.clearlooks2 .mceFocus .mceTop span {
@@ -118 +118 @@
-.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal;}
-.clearlooks2 a:hover {font-weight:bold;}
-D6D7D5
+eaf3fa
-.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px;}
-.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif);}

trunk/wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/wp-includes/js/tinymce/themes/advanced/js/link.js

@@ -51 +51 @@
-            href : f.href.value,
-            title : f.linktitle.value,
-''
-''
+null
+null
-        });
-

trunk/wp-includes/js/tinymce/themes/advanced/skins/default/content.css

@@ -1 @@
-
+
+
-body.mceForceColors {background:#FFF; color:#000;}
-
+Item
-a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
-img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}

trunk/wp-includes/js/tinymce/themes/advanced/skins/default/ui.css

@@ -77 +77 @@
-.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
-.defaultSkin .mceColorPreview {position:absolute; top:15px; left:2px; width:16px; height:4px; overflow:hidden}
+.defaultSkin .mce_forecolor, .defaultSkin .mce_backcolor {position:relative}
-
-/* Menu */

trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/content.css

@@ -1 @@
-
+
+
-body.mceForceColors {background:#FFF; color:#000;}
-
+Item
-a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.gif) no-repeat bottom left;}
-img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.gif) no-repeat;}

trunk/wp-includes/js/tinymce/themes/advanced/skins/o2k7/ui.css

@@ -25 +25 @@
-.o2k7Skin .mceStatusbar a:hover {text-decoration:underline}
-.o2k7Skin table.mceToolbar {margin-left:3px}
-
+
+
-.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
-
+, .o2k7Skin .mceToolbar .mceToolbarStartListBox span
-.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px}
-.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
@@ -46 +47 @@
-
-/* ListBox */
+.o2k7Skin .mceListBox {margin-left:3px}
-.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}
-.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
-; margin-right:2px
+
-.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}
-.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}
@@ -77 +79 @@
-.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A}
-.o2k7Skin .mceColorPreview {position:absolute; top:15px; left:2px; width:16px; height:4px; overflow:hidden}
+.o2k7Skin .mce_forecolor, .o2k7Skin .mce_backcolor {position:relative}
-
-/* Menu */

trunk/wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css

@@ -36 +36 @@
-/* Button */
-.wp_themeSkin .mceButton {
-
-
-
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-}
-.wp_themeSkin a.mceButton span, .wp_themeSkin a.mceButton img {}
-.wp_themeSkin .mceOldBoxModel a.mceButton span, .wp_themeSkin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
-.wp_themeSkin a.mceButtonEnabled:hover {
-
-
-
+   
+   
+   
-}
-.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected {
-
-
-
+   
+   
+   
-}
-.wp_themeSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30);}
@@ -66 +66 @@
-/* Separator */
-.wp_themeSkin .mceSeparator { 
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
-}
-
@@ -77 +77 @@
-.wp_themeSkin .mceListBox, .wp_themeSkin .mceListBox a {display:block}
-.wp_themeSkin .mceListBox .mceText {
-
-
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-}
-.wp_themeSkin .mceListBox {
-
-
+   
+   
-}
-.wp_themeSkin .mceListBox .mceOpen {
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
-}
-.wp_themeSkin .mceListBox .mceOpen span {
-
-
-
-
+   
+   
+   
+   
-}
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
-.wp_themeSkin .mceListBoxHover .mceText, 
-.wp_themeSkin .mceListBoxSelected .mceText {
-
-
-
-
+   
+   
+   
+   
-}
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
-.wp_themeSkin .mceListBoxHover .mceOpen, 
-.wp_themeSkin .mceListBoxSelected .mceOpen {
-
-
+   
+   
-}
-.wp_themeSkin .mceListBoxDisabled .mceText {color:gray}
@@ -129 +129 @@
-.wp_themeSkin .mceSplitButton a, .wp_themeSkin .mceSplitButton span {display:block; height:20px}
-.wp_themeSkin .mceSplitButton { 
-
-
-
+   
+   
+   
-}
-.wp_themeSkin table.mceSplitButton td {
-
+   
-}
-.wp_themeSkin .mceSplitButton a.mceAction {
-
-
-
-
-
+   
+   
+   
+   
+   
-}
-.wp_themeSkin .mceSplitButton span.mceAction {
-
-
+   
+   
-}
-.wp_themeSkin .mceSplitButton a.mceOpen {
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
-}
-.wp_themeSkin .mceSplitButton span.mceOpen {
-
-
+   
+   
-}
-.wp_themeSkin .mceSplitButton a.mceOpen:hover,
-.wp_themeSkin .mceSplitButtonSelected a.mceOpen {
-
-
-
-
+   
+   
+   
+   
-} 
-.wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction {
-
-
+   
+   
-}
-.wp_themeSkin .mceSplitButton a.mceAction:hover {
-
-
-
+   
+   
+   
-}
-.wp_themeSkin table.mceSplitButtonEnabled:hover span.mceOpen, 
@@ -181 +181 @@
-}
-.wp_themeSkin .mceSplitButtonDisabled .mceAction {
-
+   
-}
-.wp_themeSkin .mceSplitButtonActive {
-
+   
-}
-.wp_themeSkin .mceListBox a.mceText, .wp_themeSkin .mceSplitButton a.mceAction {
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
-}
-.wp_themeSkin .mceSplitButton a.mceOpen, .wp_themeSkin .mceListBox a.mceOpen {
-
-
-
-
-
-
-
-
+   
+   
+   
+