Changeset 20341

Timestamp:

04/02/2012 10:16:30 PM (14 years ago)

Author:

azaozz

Message:

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

Location:

trunk/wp-includes/js

Files:

• tinymce/plugins/wpeditimage/js/editimage.dev.js (modified) (6 diffs)
• wplink.dev.js (modified) (1 diff)

trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js

@@ -4 +4 @@
 tinyMCEPopup = {
     init: function() {
-        var t = this, w, li, q, i, it;
-
-        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;
+        var t = this, w, ti;
 
         // Find window & API
@@ -22 +12 @@
         t.editor = tinymce.EditorManager.activeEditor;
         t.params = t.editor.windowManager.params;
+        t.features = t.editor.windowManager.features;
 
         // Setup local DOM
@@ -29 +20 @@
 
     getWin : function() {
-        return window.dialogArguments || opener || parent || top;
+        return (!window.frameElement && window.dialogArguments) || opener || parent || top;
     },
 
@@ -60 +51 @@
 
     storeSelection : function() {
-        this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
+        this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
     },
 
@@ -66 +57 @@
         var t = tinyMCEPopup;
 
-        if (tinymce.isIE)
+        if ( tinymce.isIE )
             t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
     }
@@ -395 +386 @@
                     f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
 
-                if ( tinymce.isWebKit && ed.dom.hasClass(el, 'aligncenter') ) {
-                    ed.dom.removeClass(el, 'aligncenter');
-                    fixSafari = 1;
-                }
-
-                tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
-                if ( fixSafari ) ed.dom.addClass(el, 'aligncenter');
+                ed.getDoc().execCommand("unlink", false, null);
+                tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
 
                 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, {

trunk/wp-includes/js/wplink.dev.js

@@ -244 +244 @@
             if (e == 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) {