<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20341] trunk/wp-includes/js: Editor: fix adding a link in WebKit to floated image, fixes #16569</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20341">20341</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2012-04-02 22:16:30 +0000 (Mon, 02 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Editor: fix adding a link in WebKit to floated image, fixes <a href="http://core.trac.wordpress.org/ticket/16569">#16569</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcepluginswpeditimagejseditimagedevjs">trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js</a></li>
<li><a href="#trunkwpincludesjswplinkdevjs">trunk/wp-includes/js/wplink.dev.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswpeditimagejseditimagedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js (20340 => 20341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js 2012-04-02 20:05:35 UTC (rev 20340)
+++ trunk/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js 2012-04-02 22:16:30 UTC (rev 20341)
</span><span class="lines">@@ -3,24 +3,15 @@
</span><span class="cx">
</span><span class="cx"> tinyMCEPopup = {
</span><span class="cx"> init: function() {
</span><del>- var t = this, w, li, q, i, it;
</del><ins>+ var t = this, w, ti;
</ins><span class="cx">
</span><del>- 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;
-
</del><span class="cx"> // Find window & API
</span><span class="cx"> w = t.getWin();
</span><span class="cx"> tinymce = w.tinymce;
</span><span class="cx"> tinyMCE = w.tinyMCE;
</span><span class="cx"> t.editor = tinymce.EditorManager.activeEditor;
</span><span class="cx"> t.params = t.editor.windowManager.params;
</span><ins>+ t.features = t.editor.windowManager.features;
</ins><span class="cx">
</span><span class="cx"> // Setup local DOM
</span><span class="cx"> t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
</span><span class="lines">@@ -28,7 +19,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getWin : function() {
</span><del>- return window.dialogArguments || opener || parent || top;
</del><ins>+ return (!window.frameElement && window.dialogArguments) || opener || parent || top;
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> getParam : function(n, dv) {
</span><span class="lines">@@ -59,13 +50,13 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> storeSelection : function() {
</span><del>- this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
</del><ins>+ this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark(1);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> restoreSelection : function() {
</span><span class="cx"> var t = tinyMCEPopup;
</span><span class="cx">
</span><del>- if (tinymce.isIE)
</del><ins>+ if ( tinymce.isIE )
</ins><span class="cx"> t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -394,16 +385,11 @@
</span><span class="cx"> if ( ! f.link_href.value.match(/https?:\/\//i) )
</span><span class="cx"> f.link_href.value = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.link_href.value);
</span><span class="cx">
</span><del>- if ( tinymce.isWebKit && ed.dom.hasClass(el, 'aligncenter') ) {
- ed.dom.removeClass(el, 'aligncenter');
- fixSafari = 1;
- }
</del><ins>+ ed.getDoc().execCommand("unlink", false, null);
+ tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
</ins><span class="cx">
</span><del>- tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
- if ( fixSafari ) ed.dom.addClass(el, 'aligncenter');
-
</del><span class="cx"> tinymce.each(ed.dom.select("a"), function(n) {
</span><del>- if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
</del><ins>+ if ( ed.dom.getAttrib(n, 'href') == '#mce_temp_url#' ) {
</ins><span class="cx">
</span><span class="cx"> ed.dom.setAttribs(n, {
</span><span class="cx"> href : f.link_href.value,
</span></span></pre></div>
<a id="trunkwpincludesjswplinkdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/wplink.dev.js (20340 => 20341)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/wplink.dev.js 2012-04-02 20:05:35 UTC (rev 20340)
+++ trunk/wp-includes/js/wplink.dev.js 2012-04-02 22:16:30 UTC (rev 20341)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> if (e == null) {
</span><span class="cx"> ed.getDoc().execCommand("unlink", false, null);
</span><del>- tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
</del><ins>+ tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
</ins><span class="cx">
</span><span class="cx"> tinymce.each(ed.dom.select("a"), function(n) {
</span><span class="cx"> if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
</span></span></pre>
</div>
</div>
</body>
</html>