Changeset 24215

Timestamp:

05/09/2013 12:24:45 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE: fix for the disappearing placeholders bug in Chrome, see #24177

Location:

trunk/wp-includes/js/tinymce

Files:

• plugins/wordpress/editor_plugin_src.js (modified) (5 diffs)
• plugins/wpgallery/editor_plugin_src.js (modified) (6 diffs)
• themes/advanced/skins/wp_theme/content.css (modified) (2 diffs)

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

@@ -9 +9 @@
         init : function(ed, url) {
             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')+'" />';
+            moreHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-more mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+            nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-nextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
             if ( getUserSetting('hidetb', '0') == '1' )
@@ -384 +384 @@
             var moreHTML, nextpageHTML;
 
-            moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" 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')+'" />';
+            moreHTML = '<img src="' + url + '/img/trans.gif" alt="$1" class="mce-wp-more mceItemNoResize" title="'+ed.getLang('wordpress.wp_more_alt')+'" />';
+            nextpageHTML = '<img src="' + url + '/img/trans.gif" class="mce-wp-nextpage mceItemNoResize" title="'+ed.getLang('wordpress.wp_page_alt')+'" />';
 
             // Display morebreak instead if img in element path
@@ -392 +392 @@
                     ed.theme.onResolveName.add(function(th, o) {
                         if (o.node.nodeName == 'IMG') {
-                            if ( ed.dom.hasClass(o.node, 'mceWPmore') )
+                            if ( ed.dom.hasClass(o.node, 'mce-wp-more') )
                                 o.name = 'wpmore';
-                            if ( ed.dom.hasClass(o.node, 'mceWPnextpage') )
+                            if ( ed.dom.hasClass(o.node, 'mce-wp-nextpage') )
                                 o.name = 'wppage';
                         }
@@ -414 +414 @@
                 if (o.get)
                     o.content = o.content.replace(/<img[^>]+>/g, function(im) {
-                        if (im.indexOf('class="mceWPmore') !== -1) {
+                        if (im.indexOf('class="mce-wp-more') !== -1) {
                             var m, moretext = (m = im.match(/alt="(.*?)"/)) ? m[1] : '';
                             im = '<!--more'+moretext+'-->';
                         }
-                        if (im.indexOf('class="mceWPnextpage') !== -1)
+                        if (im.indexOf('class="mce-wp-nextpage') !== -1)
                             im = '<!--nextpage-->';
 
@@ -427 +427 @@
             // Set active buttons if user selected pagebreak or more break
             ed.onNodeChange.add(function(ed, cm, n) {
-                cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPnextpage'));
-                cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mceWPmore'));
+                cm.setActive('wp_page', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mce-wp-nextpage'));
+                cm.setActive('wp_more', n.nodeName === 'IMG' && ed.dom.hasClass(n, 'mce-wp-more'));
             });
         }

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

@@ -24 +24 @@
 
                 // Make sure we've selected a gallery node.
-                if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 )
+                if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wp-gallery') == -1 )
                     return;
 
@@ -41 +41 @@
                         var target = e.target;
 
-                        if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wpGallery') ) {
+                        if ( target.nodeName == 'IMG' && ed.dom.hasClass(target, 'wp-gallery') ) {
                             ed.selection.select(target);
                             ed.dom.events.cancel(e);
@@ -52 +52 @@
 
             ed.onMouseDown.add(function(ed, e) {
-                if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') ) {
+                if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wp-gallery') ) {
                     ed.plugins.wordpress._hideButtons();
                     ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns');
@@ -70 +70 @@
         _do_gallery : function(co) {
             return co.replace(/\[gallery([^\]]*)\]/g, function(a,b){
-                return '<img src="'+tinymce.baseURL+'/plugins/wpgallery/img/t.gif" class="wpGallery mceItem" title="gallery'+tinymce.DOM.encode(b)+'" />';
+                return '<img src="'+tinymce.baseURL+'/plugins/wpgallery/img/t.gif" class="wp-gallery mceItem" title="gallery'+tinymce.DOM.encode(b)+'" />';
             });
         },
@@ -84 +84 @@
                 var cls = getAttr(im, 'class');
 
-                if ( cls.indexOf('wpGallery') != -1 )
+                if ( cls.indexOf('wp-gallery') != -1 )
                     return '<p>['+tinymce.trim(getAttr(im, 'title'))+']</p>';
 
@@ -131 +131 @@
                 var ed = tinymce.activeEditor, el = ed.selection.getNode();
 
-                if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wpGallery') ) {
+                if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wp-gallery') ) {
                     ed.dom.remove(el);
 

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

@@ -100 +100 @@
 
 /* Styles for the WordPress plugins */
-img.mceWPnextpage,
-img.mceWPmore {
+img.mce-wp-nextpage,
+img.mce-wp-more {
     border: 0;
     border-top: 1px dotted #cccccc;
@@ -110 +110 @@
 }
 
-img.mceWPmore {
+img.mce-wp-more {
     background: transparent url("img/more_bug.gif") no-repeat right top;
 }
 
-img.mceWPnextpage {
+img.mce-wp-nextpage {
     background: transparent url("img/page_bug.gif") no-repeat right top;
 }
 
-img.wpGallery {
+img.wp-gallery {
     border: 1px dashed #888;
     background: #f2f8ff url("img/gallery.png") no-repeat scroll center center;