Ticket #24177: 24177.patch

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

@@ -23 +23 @@
                                         return;
 
                                 // 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;
 
                                 frame = gallery.edit( '[' + ed.dom.getAttrib( el, 'title' ) + ']' );
@@ -40 +40 @@
                                         ed.dom.events.add(ed.getBody(), 'touchstart', function(e){
                                                 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);
                                                         ed.plugins.wordpress._hideButtons();
@@ -51 +51 @@
                         });
 
                         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');
                                 }
@@ -69 +69 @@
 
                 _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)+'" />';
                         });
                 },
 
@@ -83 +83 @@
                         return co.replace(/(?:<p[^>]*>)*(<img[^>]+>)(?:<\/p>)*/g, function(a,im) {
                                 var cls = getAttr(im, 'class');
 
-                                if ( cls.indexOf('wpGallery') != -1 )
+                                if ( cls.indexOf('wp-gallery') != -1 )
                                         return '<p>['+tinymce.trim(getAttr(im, 'title'))+']</p>';
 
                                 return a;
@@ -130 +130 @@
                         tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
                                 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);
 
                                         ed.execCommand('mceRepaint');

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

@@ -127 +127 @@
     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;
         width: 99%;