Changeset 22857

Timestamp:

11/27/2012 01:31:51 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE: improve hiding of the image/gallery popup buttons, fix selecting a gallery in IE, don't leave empty paragraph after deleting an image with the popup button, fixes #22463, see #21390

Location:

trunk/wp-includes/js/tinymce/plugins

Files:

• wordpress/editor_plugin_src.js (modified) (2 diffs)
• wpeditimage/editor_plugin_src.js (modified) (3 diffs)
• wpgallery/editor_plugin_src.js (modified) (5 diffs)

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

@@ -7 +7 @@
 
     tinymce.create('tinymce.plugins.WordPress', {
-        showButtons : 0,
-
         init : function(ed, url) {
             var t = this, tbId = ed.getParam('wordpress_adv_toolbar', 'toolbar2'), last = 0, moreHTML, nextpageHTML, closeOnClick, mod_key;
@@ -375 +373 @@
                 'display' : 'block'
             });
-
-            this.showButtons = true;
         },
 
         _hideButtons : function() {
-            if ( ! this.showButtons )
-                return;
-
-            if ( document.getElementById('wp_editbtns') )
-                tinymce.DOM.hide('wp_editbtns');
-
-            if ( document.getElementById('wp_gallerybtns') )
-                tinymce.DOM.hide('wp_gallerybtns');
-
-            this.showButtons = false;
+            tinymce.DOM.hide(['wp_editbtns', 'wp_gallerybtns']);
         },
 

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

@@ -206 +206 @@
 
         _createButtons : function() {
-            var t = this, ed = t.editor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
+            var t = this, ed = tinymce.activeEditor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
+
+            if ( DOM.get('wp_editbtns') )
+                return;
 
             isRetina = ( window.devicePixelRatio && window.devicePixelRatio > 1 ) || // WebKit, Opera
                 ( window.matchMedia && window.matchMedia('(min-resolution:130dpi)').matches ); // Firefox, IE10, Opera
-
-            DOM.remove('wp_editbtns');
 
             DOM.add(document.body, 'div', {
@@ -240 +241 @@
 
             tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
-                var el = ed.selection.getNode(), p;
+                var ed = tinymce.activeEditor, el = ed.selection.getNode(), parent;
 
                 if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('mceItem') == -1 ) {
-                    if ( (p = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(p, 'mceTemp') )
-                        ed.dom.remove(p);
-                    else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 )
-                        ed.dom.remove(p);
-                    else
+                    if ( (parent = ed.dom.getParent(el, 'div')) && ed.dom.hasClass(parent, 'mceTemp') ) {
+                        ed.dom.remove(parent);
+                    } else {
+                        if ( el.parentNode.nodeName == 'A' && el.parentNode.childNodes.length == 1 )
+                            el = el.parentNode;
+
+                        if ( el.parentNode.nodeName == 'P' && el.parentNode.childNodes.length == 1 )
+                            el = el.parentNode;
+
                         ed.dom.remove(el);
+                    }
 
                     ed.execCommand('mceRepaint');
@@ -258 +264 @@
         
         _editImage : function() {
-            var ed = this.editor, url = this.url, el = ed.selection.getNode(), vp, H, W, cls = el.className;
+            var ed = tinymce.activeEditor, url = this.url, el = ed.selection.getNode(), vp, H, W, cls = el.className;
 
             if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )

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

@@ -12 +12 @@
             // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
             ed.addCommand('WP_Gallery', function() {
+                if ( tinymce.isIE )
+                    ed.selection.moveToBookmark( ed.wpGalleryBookmark );
+
                 var el = ed.selection.getNode(),
                     gallery = wp.media.gallery,
@@ -50 +53 @@
             ed.onMouseDown.add(function(ed, e) {
                 if ( e.target.nodeName == 'IMG' && ed.dom.hasClass(e.target, 'wpGallery') ) {
+                    ed.plugins.wordpress._hideButtons();
                     ed.plugins.wordpress._showButtons(e.target, 'wp_gallerybtns');
                 }
@@ -88 +92 @@
 
         _createButtons : function() {
-            var t = this, ed = t.editor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
+            var t = this, ed = tinymce.activeEditor, DOM = tinymce.DOM, editButton, dellButton, isRetina;
+
+            if ( DOM.get('wp_gallerybtns') )
+                return;
 
             isRetina = ( window.devicePixelRatio && window.devicePixelRatio > 1 ) || // WebKit, Opera
                 ( window.matchMedia && window.matchMedia('(min-resolution:130dpi)').matches ); // Firefox, IE10, Opera
-
-            DOM.remove('wp_gallerybtns');
 
             DOM.add(document.body, 'div', {
@@ -109 +114 @@
 
             tinymce.dom.Event.add(editButton, 'mousedown', function(e) {
-                ed.windowManager.bookmark = ed.selection.getBookmark('simple');
+                var ed = tinymce.activeEditor;
+                ed.wpGalleryBookmark = ed.selection.getBookmark('simple');
                 ed.execCommand("WP_Gallery");
                 ed.plugins.wordpress._hideButtons();
@@ -123 +129 @@
 
             tinymce.dom.Event.add(dellButton, 'mousedown', function(e) {
-                var el = ed.selection.getNode();
+                var ed = tinymce.activeEditor, el = ed.selection.getNode();
 
                 if ( el.nodeName == 'IMG' && ed.dom.hasClass(el, 'wpGallery') ) {