WordPress.org

Make WordPress Core

Changeset 21576


Ignore:
Timestamp:
08/22/2012 01:47:53 AM (7 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/class-wp-editor.php

    r21417 r21576  
    318318                    'paste_strip_class_attributes' => 'all',
    319319                    'paste_text_use_dialog' => true,
     320                    'webkit_fake_resize' => false,
    320321                    'spellchecker_rpc_url' => self::$baseurl . '/plugins/spellchecker/rpc.php',
    321322                    '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

    r21254 r21576  
    1515
    1616            ed.onInit.add(function(ed) {
    17                 ed.dom.events.add(ed.getBody(), 'dragstart', function(e) {
     17                ed.dom.events.add(ed.getBody(), 'mousedown', function(e) {
    1818                    var parent;
    1919
    2020                    if ( e.target.nodeName == 'IMG' && ( parent = ed.dom.getParent(e.target, 'div.mceTemp') ) ) {
    21                         ed.selection.select(parent);
     21                        if ( tinymce.isGecko )
     22                            ed.selection.select(parent);
     23                        else if ( tinymce.isWebKit )
     24                            ed.dom.events.cancel(e);
    2225                    }
    2326                });
     
    4548            });
    4649
    47             // resize the caption <dl> when the image is soft-resized by the user (only possible in Firefox and IE)
     50            // resize the caption <dl> when the image is soft-resized by the user
    4851            ed.onMouseUp.add(function(ed, e) {
    4952                if ( tinymce.isWebKit || tinymce.isOpera )
Note: See TracChangeset for help on using the changeset viewer.