<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[16457] trunk: Ludicrous speed for internal linking.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16457">16457</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-18 06:22:13 +0000 (Thu, 18 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ludicrous speed for internal linking. First pass. props koopersmith, see <a href="http://trac.wordpress.org/ticket/11420">#11420</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkeditor_plugindevjs">trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkeditor_pluginjs">trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkjswplinkdevjs">trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswplinkjswplinkjs">trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.js</a></li>
<li><a href="#trunkwpincludesjstinymcewpmcelinkphp">trunk/wp-includes/js/tinymce/wp-mce-link.php</a></li>
<li><a href="#trunkwpincludesjstinymcewptinymcejsgz">trunk/wp-includes/js/tinymce/wp-tinymce.js.gz</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpincludesjstinymcewpmcelinkincludesphp">trunk/wp-includes/js/tinymce/wp-mce-link-includes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-admin/admin-ajax.php 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> exit;
</span><span class="cx"> break;
</span><span class="cx"> case 'wp-link-ajax':
</span><del>- require_once ABSPATH . WPINC . '/js/tinymce/wp-mce-link-includes.php';
</del><ins>+ require_once ABSPATH . WPINC . '/js/tinymce/wp-mce-link.php';
</ins><span class="cx">
</span><span class="cx"> wp_link_ajax( $_POST );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-admin/admin-header.php 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
</span><span class="cx"> add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
</span><ins>+ add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
</ins><span class="cx"> wp_enqueue_script('quicktags');
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-admin/includes/post.php 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -1327,10 +1327,10 @@
</span><span class="cx"> $mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv');
</span><span class="cx">
</span><span class="cx"> if ( $teeny ) {
</span><del>- $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'media', 'fullscreen', 'wordpress', 'wplink') );
</del><ins>+ $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'media', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs') );
</ins><span class="cx"> $ext_plugins = '';
</span><span class="cx"> } else {
</span><del>- $plugins = array( 'inlinepopups', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage', 'wpgallery', 'tabfocus', 'wplink' );
</del><ins>+ $plugins = array( 'inlinepopups', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage', 'wpgallery', 'tabfocus', 'wplink', 'wpdialogs' );
</ins><span class="cx">
</span><span class="cx"> /*
</span><span class="cx"> The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
</span><span class="lines">@@ -1411,8 +1411,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $plugins = implode($plugins, ',');
-
</del><span class="cx"> if ( $teeny ) {
</span><span class="cx"> $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold, italic, underline, blockquote, separator, strikethrough, bullist, numlist,justifyleft, justifycenter, justifyright, undo, redo, link, unlink, fullscreen') );
</span><span class="cx"> $mce_buttons = implode($mce_buttons, ',');
</span><span class="lines">@@ -1485,7 +1483,7 @@
</span><span class="cx"> 'paste_strip_class_attributes' => 'all',
</span><span class="cx"> 'paste_text_use_dialog' => true,
</span><span class="cx"> 'wpeditimage_disable_captions' => $no_captions,
</span><del>- 'plugins' => $plugins
</del><ins>+ 'plugins' => implode($plugins, ',')
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
</span><span class="lines">@@ -1608,4 +1606,21 @@
</span><span class="cx"> /* ]]> */
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><ins>+
+ // Load additional inline scripts based on active plugins.
+ if ( in_array( 'wpdialogs', $plugins ) ) {
+ wp_print_scripts( array('jquery-ui-dialog', 'wpdialogsPopup') );
+ wp_print_styles('wp-jquery-ui-dialog');
+ }
+ if ( in_array( 'wplink', $plugins ) ) {
+ require_once ABSPATH . WPINC . "/js/tinymce/wp-mce-link.php";
+ add_action('tiny_mce_preload_dialogs', 'wp_link_dialog');
+ wp_print_scripts('wplink');
+ wp_print_styles('wplink');
+ }
</ins><span class="cx"> }
</span><ins>+function wp_tiny_mce_preload_dialogs() { ?>
+ <div id="preloaded-dialogs" style="display:none;">
+<?php do_action('tiny_mce_preload_dialogs'); ?>
+ </div>
+<?php }
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkeditor_plugindevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -12,10 +12,11 @@
</span><span class="cx"> // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
</span><span class="cx"> ed.addCommand('WP_Link', function() {
</span><span class="cx"> ed.windowManager.open({
</span><del>- file : tinymce.baseURL + '/wp-mce-link.php',
</del><ins>+ id : 'wp-link',
</ins><span class="cx"> width : 480,
</span><del>- height : 430,
- inline : 1
</del><ins>+ height : "auto",
+ wpDialog : true,
+ title : ed.getLang('advlink.link_desc')
</ins><span class="cx"> }, {
</span><span class="cx"> plugin_url : url // Plugin absolute URL
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkeditor_pluginjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(function(){tinymce.create("tinymce.plugins.wpLink",{init:function(a,b){a.addCommand("WP_Link",function(){a.windowManager.open({file:tinymce.baseURL+"/wp-mce-link.php",width:480,height:430,inline:1},{plugin_url:b})});a.addButton("link",{title:a.getLang("advanced.link_desc"),cmd:"WP_Link"});a.addShortcut("alt+shift+a",a.getLang("advanced.link_desc"),"WP_Link");a.onNodeChange.add(function(d,c,e){c.setActive("wplink",e.nodeName=="A")})},getInfo:function(){return{longname:"WordPress Link Dialog",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wplink",tinymce.plugins.wpLink)})();
</del><span class="cx">\ No newline at end of file
</span><ins>+(function(){tinymce.create("tinymce.plugins.wpLink",{init:function(a,b){a.addCommand("WP_Link",function(){a.windowManager.open({id:"wp-link",width:480,height:"auto",wpDialog:true,title:a.getLang("advlink.link_desc")},{plugin_url:b})});a.addButton("link",{title:a.getLang("advanced.link_desc"),cmd:"WP_Link"});a.addShortcut("alt+shift+a",a.getLang("advanced.link_desc"),"WP_Link");a.onNodeChange.add(function(d,c,e){c.setActive("wplink",e.nodeName=="A")})},getInfo:function(){return{longname:"WordPress Link Dialog",author:"WordPress",authorurl:"http://wordpress.org",infourl:"",version:"1.0"}}});tinymce.PluginManager.add("wplink",tinymce.plugins.wpLink)})();
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkjswplinkdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -12,11 +12,7 @@
</span><span class="cx"> };
</span><span class="cx"> },
</span><span class="cx"> init : function() {
</span><del>- var e;
- // Init shared vars
- ed = tinyMCEPopup.editor;
-
-
</del><ins>+ inputs.dialog = $('#wp-link');
</ins><span class="cx"> // URL
</span><span class="cx"> inputs.url = $('#url-field');
</span><span class="cx"> // Secondary options
</span><span class="lines">@@ -29,14 +25,25 @@
</span><span class="cx"> results.recent = $('#most-recent-results');
</span><span class="cx"> results.search.data('river', wpLink.riverDefaults() );
</span><span class="cx"> results.recent.data('river', wpLink.riverDefaults() );
</span><ins>+ results.group = $('.query-results', inputs.dialog);
</ins><span class="cx">
</span><span class="cx"> // Bind event handlers
</span><del>- $('#wp-update').click( wpLink.update );
- $('#wp-cancel').click( function() { tinyMCEPopup.close(); } );
- $('.query-results').delegate('li', 'click', wpLink.selectInternalLink );
- $('.query-results').scroll( wpLink.maybeLoadRiver );
</del><ins>+ $('#wp-link-update').click( wpLink.update );
+ $('#wp-link-cancel').click( function() { tinyMCEPopup.close(); } );
+
+ results.group.delegate('li', 'click', wpLink.selectInternalLink )
+ results.group.scroll( wpLink.maybeLoadRiver );
+
</ins><span class="cx"> inputs.search.keyup( wpLink.searchInternalLinks );
</span><ins>+
+ inputs.dialog.bind('dialogopen', wpLink.refresh);
+ },
</ins><span class="cx">
</span><ins>+ refresh : function() {
+ var e;
+
+ ed = tinyMCEPopup.editor;
+
</ins><span class="cx"> // If link exists, select proper values.
</span><span class="cx"> if ( e = ed.dom.getParent(ed.selection.getNode(), 'A') ) {
</span><span class="cx"> // Set URL and description.
</span><span class="lines">@@ -47,6 +54,8 @@
</span><span class="cx"> inputs.openInNewTab.attr('checked','checked');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Clear previously selected links
+ results.group.find('.selected').removeClass('selected');
</ins><span class="cx"> // Focus the URL field
</span><span class="cx"> inputs.url.focus();
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkjswplinkjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.js (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.js 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.js 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(function(d){var a={},c={},b,e={timeToTriggerRiver:150,minRiverAJAXDuration:200,lastSearch:"",riverDefaults:function(){return{page:2,allLoaded:false,active:false}},init:function(){var f;b=tinyMCEPopup.editor;a.url=d("#url-field");a.title=d("#link-title-field");a.openInNewTab=d("#link-target-checkbox");a.search=d("#search-field");c.search=d("#search-results");c.recent=d("#most-recent-results");c.search.data("river",e.riverDefaults());c.recent.data("river",e.riverDefaults());d("#wp-update").click(e.update);d("#wp-cancel").click(function(){tinyMCEPopup.close()});d(".query-results").delegate("li","click",e.selectInternalLink);d(".query-results").scroll(e.maybeLoadRiver);a.search.keyup(e.searchInternalLinks);if(f=b.dom.getParent(b.selection.getNode(),"A")){a.url.val(f.href);a.title.val(b.dom.getAttrib(f,"title"));if("_blank"==b.dom.getAttrib(f,"target")){a.openInNewTab.attr("checked","checked")}}a.url.focus()},update:function(){var j,g=tinyMCEPopup.editor,h={href:a.url.val(),title:a.title.val(),target:a.openInNewTab.attr("checked")?"_blank":""},k,f,i=h.title?h.title:h.href;tinyMCEPopup.restoreSelection();k=g.dom.getParent(g.selection.getNode(),"A");if(!h.href){if(g.selection.isCollapsed()){tinyMCEPopup.close();return}else{if(k){tinyMCEPopup.execCommand("mceBeginUndoLevel");f=g.selection.getBookmark();g.dom.remove(k,1);g.selection.moveToBookmark(f);tinyMCEPopup.execCommand("mceEndUndoLevel");tinyMCEPopup.close();return}}}tinyMCEPopup.execCommand("mceBeginUndoLevel");if(k==null){g.getDoc().execCommand("unlink",false,null);if(g.selection.isCollapsed()){j=g.dom.create("a",{href:"#mce_temp_url#"},i);g.selection.setNode(j)}else{tinyMCEPopup.execCommand("CreateLink",false,"#mce_temp_url#",{skip_undo:1})}tinymce.each(g.dom.select("a"),function(l){if(g.dom.getAttrib(l,"href")=="#mce_temp_url#"){k=l;g.dom.setAttribs(k,h)}})}else{g.dom.setAttribs(k,h)}if(k.childNodes.length!=1||k.firstChild.nodeName!="IMG"){g.focus();g.selection.select(k);g.selection.collapse(0);tinyMCEPopup.storeSelection()}tinyMCEPopup.execCommand("mceEndUndoLevel");tinyMCEPopup.close()},selectInternalLink:function(){var f=d(this);if(f.hasClass("unselectable")){return}f.siblings(".selected").removeClass("selected");f.addClass("selected");a.url.val(f.children(".item-permalink").val());a.title.val(f.children(".item-title").text())},maybeLoadRiver:function(){var h=d(this),g=h.children("ul"),i=h.data("river"),f=h.scrollTop()+h.height();if(f!=g.height()||i.active||i.allLoaded){return}setTimeout(function(){var j=h.scrollTop(),k=j+h.height(),l=h.find(".river-waiting");if(f!=k||k!=g.height()||i.active||i.allLoaded){return}i.active=true;l.show();h.scrollTop(j+l.outerHeight());e.linkAJAX(h,{page:i.page},function(m){i.page++;i.active=false;i.allLoaded=!m;l.hide()},{append:true,delay:e.minRiverAJAXDuration})},e.timeToTriggerRiver)},searchInternalLinks:function(){var f=d(this),h,g=f.val();if(g.length>2){c.recent.hide();c.search.show();if(e.lastSearch==g){return}e.lastSearch=g;h=f.siblings("img.waiting").show();c.search.data("river",e.riverDefaults());c.search.scrollTop(0);e.linkAJAX(c.search,{title:g},function(){h.hide()})}else{c.search.hide();c.recent.show()}},linkAJAX:function(i,h,j,g){var f;g=g||{};if(!i.hasClass("query-results")){i=i.parents(".query-results")}if(!i.length){return}f=e.delayedCallback(function(k){e.processAJAXResponse(i,k,j,g)},g.delay);d.post(ajaxurl,d.extend({action:"wp-link-ajax"},h),f,"json")},processAJAXResponse:function(i,f,j,g){var h="";if(!f){if(!g.append){h+='<li class="no-matches-found unselectable"><span class="item-title"><em>'+wpLinkL10n.noMatchesFound+"</em></span></li>"}}else{d.each(f,function(){h+='<li><input type="hidden" class="item-permalink" value="'+this["permalink"]+'" />';h+='<span class="item-title">';h+=this["title"]?this["title"]:"<em>"+wpLinkL10n.untitled+"</em>";h+='</span><span class="item-info">'+this["info"]+"</span></li>"})}i.children("ul")[g.append?"append":"html"](h);if(j){j(f)}},delayedCallback:function(h,f){var k,j,i,g;if(!f){return h}setTimeout(function(){if(j){return h.apply(g,i)}k=true},f);return function(){if(k){return h.apply(this,arguments)}i=arguments;g=this;j=true}}};d(document).ready(e.init)})(jQuery);
</del><span class="cx">\ No newline at end of file
</span><ins>+(function(d){var a={},c={},b,e={timeToTriggerRiver:150,minRiverAJAXDuration:200,lastSearch:"",riverDefaults:function(){return{page:2,allLoaded:false,active:false}},init:function(){a.dialog=d("#wp-link");a.url=d("#url-field");a.title=d("#link-title-field");a.openInNewTab=d("#link-target-checkbox");a.search=d("#search-field");c.search=d("#search-results");c.recent=d("#most-recent-results");c.search.data("river",e.riverDefaults());c.recent.data("river",e.riverDefaults());c.group=d(".query-results",a.dialog);d("#wp-link-update").click(e.update);d("#wp-link-cancel").click(function(){tinyMCEPopup.close()});c.group.delegate("li","click",e.selectInternalLink);c.group.scroll(e.maybeLoadRiver);a.search.keyup(e.searchInternalLinks);a.dialog.bind("dialogopen",e.refresh)},refresh:function(){var f;b=tinyMCEPopup.editor;if(f=b.dom.getParent(b.selection.getNode(),"A")){a.url.val(f.href);a.title.val(b.dom.getAttrib(f,"title"));if("_blank"==b.dom.getAttrib(f,"target")){a.openInNewTab.attr("checked","checked")}}c.group.find(".selected").removeClass("selected");a.url.focus()},update:function(){var j,g=tinyMCEPopup.editor,h={href:a.url.val(),title:a.title.val(),target:a.openInNewTab.attr("checked")?"_blank":""},k,f,i=h.title?h.title:h.href;tinyMCEPopup.restoreSelection();k=g.dom.getParent(g.selection.getNode(),"A");if(!h.href){if(g.selection.isCollapsed()){tinyMCEPopup.close();return}else{if(k){tinyMCEPopup.execCommand("mceBeginUndoLevel");f=g.selection.getBookmark();g.dom.remove(k,1);g.selection.moveToBookmark(f);tinyMCEPopup.execCommand("mceEndUndoLevel");tinyMCEPopup.close();return}}}tinyMCEPopup.execCommand("mceBeginUndoLevel");if(k==null){g.getDoc().execCommand("unlink",false,null);if(g.selection.isCollapsed()){j=g.dom.create("a",{href:"#mce_temp_url#"},i);g.selection.setNode(j)}else{tinyMCEPopup.execCommand("CreateLink",false,"#mce_temp_url#",{skip_undo:1})}tinymce.each(g.dom.select("a"),function(l){if(g.dom.getAttrib(l,"href")=="#mce_temp_url#"){k=l;g.dom.setAttribs(k,h)}})}else{g.dom.setAttribs(k,h)}if(k.childNodes.length!=1||k.firstChild.nodeName!="IMG"){g.focus();g.selection.select(k);g.selection.collapse(0);tinyMCEPopup.storeSelection()}tinyMCEPopup.execCommand("mceEndUndoLevel");tinyMCEPopup.close()},selectInternalLink:function(){var f=d(this);if(f.hasClass("unselectable")){return}f.siblings(".selected").removeClass("selected");f.addClass("selected");a.url.val(f.children(".item-permalink").val());a.title.val(f.children(".item-title").text())},maybeLoadRiver:function(){var h=d(this),g=h.children("ul"),i=h.data("river"),f=h.scrollTop()+h.height();if(f!=g.height()||i.active||i.allLoaded){return}setTimeout(function(){var j=h.scrollTop(),k=j+h.height(),l=h.find(".river-waiting");if(f!=k||k!=g.height()||i.active||i.allLoaded){return}i.active=true;l.show();h.scrollTop(j+l.outerHeight());e.linkAJAX(h,{page:i.page},function(m){i.page++;i.active=false;i.allLoaded=!m;l.hide()},{append:true,delay:e.minRiverAJAXDuration})},e.timeToTriggerRiver)},searchInternalLinks:function(){var f=d(this),h,g=f.val();if(g.length>2){c.recent.hide();c.search.show();if(e.lastSearch==g){return}e.lastSearch=g;h=f.siblings("img.waiting").show();c.search.data("river",e.riverDefaults());c.search.scrollTop(0);e.linkAJAX(c.search,{title:g},function(){h.hide()})}else{c.search.hide();c.recent.show()}},linkAJAX:function(i,h,j,g){var f;g=g||{};if(!i.hasClass("query-results")){i=i.parents(".query-results")}if(!i.length){return}f=e.delayedCallback(function(k){e.processAJAXResponse(i,k,j,g)},g.delay);d.post(ajaxurl,d.extend({action:"wp-link-ajax"},h),f,"json")},processAJAXResponse:function(i,f,j,g){var h="";if(!f){if(!g.append){h+='<li class="no-matches-found unselectable"><span class="item-title"><em>'+wpLinkL10n.noMatchesFound+"</em></span></li>"}}else{d.each(f,function(){h+='<li><input type="hidden" class="item-permalink" value="'+this["permalink"]+'" />';h+='<span class="item-title">';h+=this["title"]?this["title"]:"<em>"+wpLinkL10n.untitled+"</em>";h+='</span><span class="item-info">'+this["info"]+"</span></li>"})}i.children("ul")[g.append?"append":"html"](h);if(j){j(f)}},delayedCallback:function(h,f){var k,j,i,g;if(!f){return h}setTimeout(function(){if(j){return h.apply(g,i)}k=true},f);return function(){if(k){return h.apply(this,arguments)}i=arguments;g=this;j=true}}};d(document).ready(e.init)})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcelinkincludesphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-includes/js/tinymce/wp-mce-link-includes.php (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-link-includes.php 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/js/tinymce/wp-mce-link-includes.php 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-<?php
-// args expects optionally 'pagenum' and 's'
-function wp_link_query( $args = array() ) {
- $pts = get_post_types( array( 'publicly_queryable' => true ), 'objects' );
- $pt_names = array_keys( $pts );
-
- $query = array(
- 'post_type' => $pt_names,
- 'suppress_filters' => true,
- 'update_post_term_cache' => false,
- 'update_post_meta_cache' => false,
- 'post_status' => 'publish',
- 'order' => 'DESC',
- 'orderby' => 'post_date',
- 'posts_per_page' => 20,
- );
-
- $args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
-
- if ( isset( $args['s'] ) )
- $query['s'] = $args['s'];
-
- $query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
-
- // Do main query.
- $get_posts = new WP_Query;
- $posts = $get_posts->query( $query );
- // Check if any posts were found.
- if ( ! $get_posts->post_count )
- return false;
-
- // Build results.
- $results = array();
- foreach ( $posts as $post ) {
- if ( 'post' == $post->post_type )
- $info = mysql2date( __( 'Y/m/d' ), $post->post_date );
- else
- $info = $pts[ $post->post_type ]->labels->singular_name;
-
- $results[] = array(
- 'ID' => $post->ID,
- 'title' => esc_html( strip_tags($post->post_title) ),
- 'permalink' => get_permalink( $post->ID ),
- 'info' => $info,
- );
- }
-
- return $results;
-}
-
-function wp_link_ajax( $request ) {
- // Searches have a title term.
- if ( isset( $request['title'] ) )
- $args['s'] = stripslashes( $request['title'] );
- $args['pagenum'] = ! empty( $request['page'] ) ? absint( $request['page'] ) : 1;
-
- $results = wp_link_query( $args );
-
- if ( ! isset( $results ) )
- die( '0' );
-
- echo json_encode( $results );
- echo "\n";
-}
-
-?>
</del><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcelinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-link.php (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-link.php 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/js/tinymce/wp-mce-link.php 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -1,160 +1,71 @@
</span><span class="cx"> <?php
</span><ins>+// args expects optionally 'pagenum' and 's'
+function wp_link_query( $args = array() ) {
+ $pts = get_post_types( array( 'publicly_queryable' => true ), 'objects' );
+ $pt_names = array_keys( $pts );
</ins><span class="cx">
</span><del>-require_once '../../../wp-load.php';
-include './wp-mce-link-includes.php';
</del><ins>+ $query = array(
+ 'post_type' => $pt_names,
+ 'suppress_filters' => true,
+ 'update_post_term_cache' => false,
+ 'update_post_meta_cache' => false,
+ 'post_status' => 'publish',
+ 'order' => 'DESC',
+ 'orderby' => 'post_date',
+ 'posts_per_page' => 20,
+ );
</ins><span class="cx">
</span><del>-header( 'Content-Type: text/html; charset=' . get_bloginfo( 'charset' ) );
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
-<head>
-<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_bloginfo('charset'); ?>" />
-<title><?php _e( 'Insert/edit link' ); ?></title>
-<script type="text/javascript">
-//<![CDATA[
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php' ); ?>',
- wpLinkL10n = {
- untitled : '<?php _e('Untitled'); ?>',
- noMatchesFound : '<?php _e( 'No matches found.' ); ?>'
- };
-//]]>
-</script>
-<script type="text/javascript" src="tiny_mce_popup.js?ver=3223"></script>
-<?php
-wp_print_scripts( array( 'jquery', 'jquery-ui-widget' ) );
-$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.dev' : '';
-$src = "plugins/wplink/js/wplink$suffix.js?ver=20101116b";
-?>
-<script type="text/javascript" src="<?php echo $src; ?>"></script>
-<?php
-wp_admin_css( 'global', true );
-wp_admin_css( 'wp-admin', true );
-register_admin_color_schemes();
-wp_admin_css( 'colors', true );
-?>
-<style>
-html {
- background: #f1f1f1;
</del><ins>+ $args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
+
+ if ( isset( $args['s'] ) )
+ $query['s'] = $args['s'];
+
+ $query['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+
+ // Do main query.
+ $get_posts = new WP_Query;
+ $posts = $get_posts->query( $query );
+ // Check if any posts were found.
+ if ( ! $get_posts->post_count )
+ return false;
+
+ // Build results.
+ $results = array();
+ foreach ( $posts as $post ) {
+ if ( 'post' == $post->post_type )
+ $info = mysql2date( __( 'Y/m/d' ), $post->post_date );
+ else
+ $info = $pts[ $post->post_type ]->labels->singular_name;
+
+ $results[] = array(
+ 'ID' => $post->ID,
+ 'title' => esc_html( strip_tags($post->post_title) ),
+ 'permalink' => get_permalink( $post->ID ),
+ 'info' => $info,
+ );
+ }
+
+ return $results;
</ins><span class="cx"> }
</span><del>-a:link, a:visited {
- color: #21759b;
</del><ins>+
+function wp_link_ajax( $request ) {
+ // Searches have a title term.
+ if ( isset( $request['title'] ) )
+ $args['s'] = stripslashes( $request['title'] );
+ $args['pagenum'] = ! empty( $request['page'] ) ? absint( $request['page'] ) : 1;
+
+ $results = wp_link_query( $args );
+
+ if ( ! isset( $results ) )
+ die( '0' );
+
+ echo json_encode( $results );
+ echo "\n";
</ins><span class="cx"> }
</span><del>-p.howto {
- margin: 3px;
-}
-#link-options {
- padding: 10px 0 14px;
- border-bottom: 1px solid #dfdfdf;
- margin: 0 6px 14px;
-}
-label input[type="text"] {
- width: 360px;
- margin-top: 5px;
-}
-label span {
- display: inline-block;
- width: 80px;
- text-align: right;
- padding-right: 5px;
-}
-.link-search-wrapper {
- margin: 5px 5px 9px;
- display: block;
- overflow: hidden;
-}
-.link-search-wrapper span {
- float: left;
- margin-top: 6px;
-}
-.link-search-wrapper input[type="text"] {
- float: left;
- width: 220px;
-}
-.link-search-wrapper img.waiting {
- margin: 8px 1px 0 4px;
- float: left;
- display: none;
-}
-#open-in-new-tab {
- display: inline-block;
- padding: 3px 0 0;
- margin: 0 0 0 87px;
-}
-#open-in-new-tab span {
- width: auto;
- margin-left: 6px;
- font-size: 11px;
-}
-.query-results {
- border: 1px #dfdfdf solid;
- margin: 0 5px 5px;
- background: #fff;
- height: 185px;
- overflow: auto;
-}
-.query-results li {
- margin-bottom: 0;
- border-bottom: 1px solid #f1f1f1;
- color: #555;
- padding: 4px 6px;
- cursor: pointer;
-}
-.query-results li:hover {
- background: #eaf2fa;
- color: #333;
-}
-.query-results li.unselectable:hover {
- background: #fff;
- cursor: auto;
- color: #555;
-}
-.query-results li.unselectable {
- border-bottom: 1px solid #dfdfdf;
-}
-.query-results li.selected {
- background: #f1f1f1;
- color: #333;
-}
-.query-results li.selected .item-title {
- font-weight: bold;
-}
-.item-info {
- text-transform: uppercase;
- color: #aaa;
- font-size: 11px;
- float: right;
-}
-#search-results {
- display: none;
-}
-.river-waiting {
- display: none;
- padding: 10px 0;
-}
-.river-waiting img.waiting {
- margin: 0 auto;
- display: block;
-}
-.submitbox {
- padding: 5px 5px 0;
- font-size: 11px;
- overflow: auto;
- height: 29px;
-}
-#wp-cancel {
- line-height: 25px;
- float: left;
-}
-#wp-update {
- line-height: 23px;
- float: right;
-}
-#wp-update a {
- display: inline-block;
-}
-</style>
-</head>
-<body id="post-body">
</del><ins>+
+function wp_link_dialog() {
+?>
+<div id="wp-link">
</ins><span class="cx"> <div id="link-selector">
</span><span class="cx"> <div id="link-options">
</span><span class="cx"> <p class="howto"><?php _e( 'Enter the destination URL:' ); ?></p>
</span><span class="lines">@@ -204,12 +115,12 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="submitbox">
</span><del>- <div id="wp-cancel">
</del><ins>+ <div id="wp-link-cancel">
</ins><span class="cx"> <a class="submitdelete deletion"><?php _e( 'Cancel' ); ?></a>
</span><span class="cx"> </div>
</span><del>- <div id="wp-update">
</del><ins>+ <div id="wp-link-update">
</ins><span class="cx"> <a class="button-primary"><?php _e( 'Update' ); ?></a>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-</body>
-</html>
</del><span class="cx">\ No newline at end of file
</span><ins>+</div>
+<?php } ?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewptinymcejsgz"></a>
<div class="binary"><h4>Modified: trunk/wp-includes/js/tinymce/wp-tinymce.js.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (16456 => 16457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2010-11-18 05:38:53 UTC (rev 16456)
+++ trunk/wp-includes/script-loader.php 2010-11-18 06:22:13 UTC (rev 16457)
</span><span class="lines">@@ -268,6 +268,14 @@
</span><span class="cx"> 'url' => __( 'URL:' ),
</span><span class="cx"> 'noShortlink' => __( 'No shortlink available for this page.' ),
</span><span class="cx"> ) );
</span><ins>+
+ $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array('jquery'), '20101117' );
+ $scripts->localize( 'wplink', 'wpLinkL10n', array(
+ 'untitled' => __('Untitled'),
+ 'noMatchesFound' => __('No matches found.'),
+ ) );
+
+ $scripts->add( 'wpdialogsPopup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", false, '20101117' );
</ins><span class="cx">
</span><span class="cx"> if ( is_admin() ) {
</span><span class="cx"> $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
</span><span class="lines">@@ -504,6 +512,11 @@
</span><span class="cx">
</span><span class="cx"> // Admin bar
</span><span class="cx"> $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101117' );
</span><ins>+
+ // WP jQuery UI Dialog
+ $styles->add( 'wp-jquery-ui-dialog', "/wp-includes/css/jquery-ui-dialog$suffix.css", array(), '20101117' );
+ // WPLink TinyMCE plugin
+ $styles->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/css/wplink$suffix.css", array(), '20101117' );
</ins><span class="cx">
</span><span class="cx"> foreach ( $rtl_styles as $rtl_style ) {
</span><span class="cx"> $styles->add_data( $rtl_style, 'rtl', true );
</span></span></pre>
</div>
</div>
</body>
</html>