Changeset 24211

Timestamp:

05/08/2013 11:03:44 PM (13 years ago)

Author:

azaozz

Message:

TinyMCE: attempt a workaround for WebKit bug inserting spans with font styles when creating UL or OL. See #17154

Location:

trunk/wp-includes/js/tinymce

Files:

• plugins/wordpress/editor_plugin_src.js (modified) (2 diffs)
• themes/advanced/skins/wp_theme/content.css (modified) (1 diff)

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

@@ -8 +8 @@
         tinymce.create('tinymce.plugins.WordPress', {
                 init : function(ed, url) {
-                        var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key;
+                        var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key, style;
                         moreHTML = '<img src="' + url + '/img/trans.gif" class="mceWPmore mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
                         nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mceWPnextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
@@ -134 +134 @@
                                         }
                                 }
+
+                                if ( tinymce.isWebKit && ( 'InsertUnorderedList' == cmd || 'InsertOrderedList' == cmd ) ) {
+                                        if ( !style )
+                                                style = ed.dom.create('style', {'type': 'text/css'}, '#tinymce,#tinymce span,#tinymce li,#tinymce li>span,#tinymce p,#tinymce p>span{font:medium sans-serif;color:#000;line-height:normal;}');
+
+                                        ed.getDoc().head.appendChild( style );
+                                }
+                        });
+
+                        ed.onExecCommand.add( function( ed, cmd, ui, val ) {
+                                if ( tinymce.isWebKit && style && ( 'InsertUnorderedList' == cmd || 'InsertOrderedList' == cmd ) )
+                                        ed.dom.remove( style );
                         });
 

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

@@ -44 +44 @@
         color: #333;
         margin: 10px;
-}
-
-br[data-mce-bogus] {
-        line-height: 1em;
-        margin-top: -1em;
-}
-
-br[data-mce-bogus]:only-child {
-        line-height: inherit;
-        margin-top: inherit;
 }