Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-07-03 02:05:41 +02:00
Code Issues Projects Releases Wiki Activity

TinyMCE in Firefox: fix crash when dragging images with caption, drag the image together with the caption (only in Firefox 3.5+)

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-10-22 05:30:29 +00:00
parent c29de44907
commit 201d24f044
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js
View File

@ -40,6 +40,13 @@
tinymce.dom.Event.add(ed.getWin(), 'scroll', function(e) {
ed.plugins.wpeditimage.hideButtons();
});
tinymce.dom.Event.add(ed.getBody(), 'dragstart', function(e) {
ed.plugins.wpeditimage.hideButtons();
if ( !tinymce.isGecko && e.target.nodeName == 'IMG' && ed.dom.getParent(e.target, 'dl.wp-caption') )
return tinymce.dom.Event.cancel(e);
});
});
ed.onBeforeExecCommand.add(function(ed, cmd, ui, val) {
@ -51,33 +58,32 @@
});
ed.onMouseUp.add(function(ed, e) {
var n, DL;
if ( tinymce.isOpera ) {
if ( e.target.nodeName == 'IMG' )
ed.plugins.wpeditimage.showButtons(e.target);
} else if ( ! tinymce.isWebKit ) {
n = ed.selection.getNode();
if ( n.nodeName == 'IMG' && (DL = ed.dom.getParent(n, 'DL')) ) {
window.setTimeout(function(){
var ed = tinyMCE.activeEditor, n = ed.selection.getNode(), DL = ed.dom.getParent(n, 'DL');
if ( n.width != (parseInt(ed.dom.getStyle(DL, 'width')) - 10) ) {
ed.dom.setStyle(DL, 'width', parseInt(n.width)+10);
ed.execCommand('mceRepaint');
}
}, 100);
}
if ( tinymce.isWebKit || tinymce.isOpera )
return;
if ( ed.dom.getParent(e.target, 'div.mceTemp') || ed.dom.is(e.target, 'div.mceTemp') ) {
window.setTimeout(function(){
var ed = tinyMCE.activeEditor, n = ed.selection.getNode(), DL = ed.dom.getParent(n, 'dl.wp-caption');
if ( DL && n.width != ( parseInt(ed.dom.getStyle(DL, 'width'), 10) - 10 ) ) {
ed.dom.setStyle(DL, 'width', parseInt(n.width, 10) + 10);
ed.execCommand('mceRepaint');
}
}, 100);
}
});
ed.onMouseDown.add(function(ed, e) {
if ( tinymce.isOpera || e.target.nodeName != 'IMG' ) {
var p;
if ( e.target.nodeName != 'IMG' ) {
t.hideButtons();
return;
}
ed.plugins.wpeditimage.showButtons(e.target);
if ( tinymce.isGecko && (p = ed.dom.getParent(e.target, 'dl.wp-caption')) && ed.dom.hasClass(p.parentNode, 'mceTemp') )
ed.selection.select(p.parentNode);
});
ed.onKeyPress.add(function(ed, e) {
@ -124,7 +130,7 @@
div_cls = (cls == 'aligncenter') ? 'mceTemp mceIEcenter' : 'mceTemp';
return '<div class="'+div_cls+'"><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+(10+parseInt(w))+
return '<div class="'+div_cls+'" draggable><dl id="'+id+'" class="wp-caption '+cls+'" style="width: '+(10+parseInt(w))+
'px"><dt class="wp-caption-dt">'+c+'</dt><dd class="wp-caption-dd">'+cap+'</dd></dl></div>';
});
},
@ -196,12 +202,10 @@
title : ed.getLang('wpeditimage.edit_img')
});
wp_editimgbtn.onmousedown = function(e) {
var ed = tinyMCE.activeEditor;
tinymce.dom.Event.add(wp_editimgbtn, 'mousedown', function(e) {
ed.windowManager.bookmark = ed.selection.getBookmark('simple');
ed.execCommand("WP_EditImage");
this.parentNode.style.display = 'none';
};
});
wp_delimgbtn = DOM.add('wp_editbtns', 'img', {
src : t.url+'/img/delete.png',
@ -211,7 +215,7 @@
title : ed.getLang('wpeditimage.del_img')
});
wp_delimgbtn.onmousedown = function(e) {
tinymce.dom.Event.add(wp_delimgbtn, 'mousedown', function(e) {
var ed = tinyMCE.activeEditor, el = ed.selection.getNode(), p;
if ( el.nodeName == 'IMG' && ed.dom.getAttrib(el, 'class').indexOf('mceItem') == -1 ) {
@ -219,13 +223,13 @@
ed.dom.remove(p);
else if ( (p = ed.dom.getParent(el, 'A')) && p.childNodes.length == 1 )
ed.dom.remove(p);
else ed.dom.remove(el);
else
ed.dom.remove(el);
this.parentNode.style.display = 'none';
ed.execCommand('mceRepaint');
return false;
}
};
});
},
getInfo : function() {

2
wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -22,7 +22,7 @@ $wp_db_version = 12060;
*
* @global string $tinymce_version
*/
$tinymce_version = '327-1235a';
$tinymce_version = '327-1235';
/**
* Holds the cache manifest version