Changeset 21576

Timestamp:

08/22/2012 01:47:53 AM (12 years ago)

Author:

azaozz

Message:

Disable the (fake) image resizing in WebKit and Opera in TinyMCE 3.5.6, fix dragging image with caption in Firefox, see #21173

Location:

trunk/wp-includes

Files:

• class-wp-editor.php (modified) (1 diff)
• js/tinymce/plugins/wpeditimage/editor_plugin_src.js (modified) (2 diffs)

trunk/wp-includes/class-wp-editor.php

@@ -318 +318 @@
                     'paste_strip_class_attributes' => 'all',
                     'paste_text_use_dialog' => true,
+                    'webkit_fake_resize' => false,
                     'spellchecker_rpc_url' => self::$baseurl . '/plugins/spellchecker/rpc.php',
                     'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',

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

@@ -15 +15 @@
 
             ed.onInit.add(function(ed) {
-                ed.dom.events.add(ed.getBody(), 'dragstart', function(e) {
+                ed.dom.events.add(ed.getBody(), 'mousedown', function(e) {
                     var parent;
 
                     if ( e.target.nodeName == 'IMG' && ( parent = ed.dom.getParent(e.target, 'div.mceTemp') ) ) {
-                        ed.selection.select(parent);
+                        if ( tinymce.isGecko )
+                            ed.selection.select(parent);
+                        else if ( tinymce.isWebKit )
+                            ed.dom.events.cancel(e);
                     }
                 });
@@ -45 +48 @@
             });
 
-            // resize the caption <dl> when the image is soft-resized by the user (only possible in Firefox and IE)
+            // resize the caption <dl> when the image is soft-resized by the user
             ed.onMouseUp.add(function(ed, e) {
                 if ( tinymce.isWebKit || tinymce.isOpera )