WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Editor: fix adding a link in WebKit to floated image, fixes #16569 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2012-04-02 22:16:30 +00:00
parent eaf043e37c
commit 06aedd898e
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js
View File

@ -3,17 +3,7 @@ var tinymce = null, tinyMCEPopup, tinyMCE, wpImage;
tinyMCEPopup = { tinyMCEPopup = {
init: function() { init: function() {
var t = this, w, li, q, i, it; var t = this, w, ti;
li = ('' + document.location.search).replace(/^\?/, '').split('&');
q = {};
for ( i = 0; i < li.length; i++ ) {
it = li[i].split('=');
q[unescape(it[0])] = unescape(it[1]);
}
if (q.mce_rdomain)
document.domain = q.mce_rdomain;
// Find window & API // Find window & API
w = t.getWin(); w = t.getWin();
@ -21,6 +11,7 @@ tinyMCEPopup = {
tinyMCE = w.tinyMCE; tinyMCE = w.tinyMCE;
t.editor = tinymce.EditorManager.activeEditor; t.editor = tinymce.EditorManager.activeEditor;
t.params = t.editor.windowManager.params; t.params = t.editor.windowManager.params;
t.features = t.editor.windowManager.features;
// Setup local DOM // Setup local DOM
t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document); t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
@ -28,7 +19,7 @@ tinyMCEPopup = {
}, },
getWin : function() { getWin : function() {
return window.dialogArguments || opener || parent || top; return (!window.frameElement && window.dialogArguments) || opener || parent || top;
}, },
getParam : function(n, dv) { getParam : function(n, dv) {
@ -59,13 +50,13 @@ tinyMCEPopup = {
}, },
storeSelection : function() { storeSelection : function() {
this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple'); this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
}, },
restoreSelection : function() { restoreSelection : function() {
var t = tinyMCEPopup; var t = tinyMCEPopup;
if (tinymce.isIE) if ( tinymce.isIE )
t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark); t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
} }
} }
@ -394,16 +385,11 @@ wpImage = {
if ( ! f.link_href.value.match(/https?:\/\//i) ) if ( ! f.link_href.value.match(/https?:\/\//i) )
f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value); f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
if ( tinymce.isWebKit && ed.dom.hasClass(el, 'aligncenter') ) { ed.getDoc().execCommand("unlink", false, null);
ed.dom.removeClass(el, 'aligncenter'); tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
fixSafari = 1;
}
tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
if ( fixSafari ) ed.dom.addClass(el, 'aligncenter');
tinymce.each(ed.dom.select("a"), function(n) { tinymce.each(ed.dom.select("a"), function(n) {
if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') { if ( ed.dom.getAttrib(n, 'href') == '#mce_temp_url#' ) {
ed.dom.setAttribs(n, { ed.dom.setAttribs(n, {
href : f.link_href.value, href : f.link_href.value,

2
wp-includes/js/wplink.dev.js
View File

@ -243,7 +243,7 @@ var wpLink;
if (e == null) { if (e == null) {
ed.getDoc().execCommand("unlink", false, null); ed.getDoc().execCommand("unlink", false, null);
tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1}); tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
tinymce.each(ed.dom.select("a"), function(n) { tinymce.each(ed.dom.select("a"), function(n) {
if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') { if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {