Changeset 16457

Timestamp:

11/18/2010 06:22:13 AM (13 years ago)

Author:

nacin

Message:

Ludicrous speed for internal linking. First pass. props koopersmith, see #11420.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (4 diffs)
• wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wplink/editor_plugin.js (modified) (1 diff)
• wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js (modified) (3 diffs)
• wp-includes/js/tinymce/plugins/wplink/js/wplink.js (modified) (1 diff)
• wp-includes/js/tinymce/wp-mce-link-includes.php (deleted)
• wp-includes/js/tinymce/wp-mce-link.php (modified) (2 diffs)
• wp-includes/js/tinymce/wp-tinymce.js.gz (modified) (previous)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -1075 +1075 @@
     break;
 case 'wp-link-ajax':
-    require_once ABSPATH . WPINC . '/js/tinymce/wp-mce-link-includes.php';
+    require_once ABSPATH . WPINC . '/js/tinymce/wp-mce-link.php';
 
     wp_link_ajax( $_POST );

trunk/wp-admin/admin-header.php

@@ -67 +67 @@
 if ( in_array( $pagenow, array('post.php', 'post-new.php') ) ) {
     add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
+    add_action( 'admin_print_footer_scripts', 'wp_tiny_mce_preload_dialogs', 30 );
     wp_enqueue_script('quicktags');
 }

trunk/wp-admin/includes/post.php

@@ -1328 +1328 @@
 
     if ( $teeny ) {
-        $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'media', 'fullscreen', 'wordpress', 'wplink') );
+        $plugins = apply_filters( 'teeny_mce_plugins', array('inlinepopups', 'media', 'fullscreen', 'wordpress', 'wplink', 'wpdialogs') );
         $ext_plugins = '';
     } else {
-        $plugins = array( 'inlinepopups', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage', 'wpgallery', 'tabfocus', 'wplink' );
+        $plugins = array( 'inlinepopups', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage', 'wpgallery', 'tabfocus', 'wplink', 'wpdialogs' );
 
         /*
@@ -1411 +1411 @@
         }
     }
-
-    $plugins = implode($plugins, ',');
 
     if ( $teeny ) {
@@ -1486 +1484 @@
         'paste_text_use_dialog' => true,
         'wpeditimage_disable_captions' => $no_captions,
-        'plugins' => $plugins
+        'plugins' => implode($plugins, ',')
     );
 
@@ -1609 +1607 @@
 </script>
 <?php
-}
+
+    // 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');
+    }
+}
+function wp_tiny_mce_preload_dialogs() { ?>
+    <div id="preloaded-dialogs" style="display:none;">
+<?php   do_action('tiny_mce_preload_dialogs'); ?>
+    </div>
+<?php }

trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js

@@ -13 +13 @@
             ed.addCommand('WP_Link', function() {
                 ed.windowManager.open({
-                    file : tinymce.baseURL + '/wp-mce-link.php',
+                    id : 'wp-link',
                     width : 480,
-                    height : 430,
-                    inline : 1
+                    height : "auto",
+                    wpDialog : true,
+                    title : ed.getLang('advlink.link_desc')
                 }, {
                     plugin_url : url // Plugin absolute URL

trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js

@@ -1 @@
-(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)})();
+(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)})();

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

@@ -13 +13 @@
         },
         init : function() {
-            var e;
-            // Init shared vars
-            ed = tinyMCEPopup.editor;
-
-
+            inputs.dialog = $('#wp-link');
             // URL
             inputs.url = $('#url-field');
@@ -30 +26 @@
             results.search.data('river', wpLink.riverDefaults() );
             results.recent.data('river', wpLink.riverDefaults() );
+            results.group = $('.query-results', inputs.dialog);
 
             // Bind event handlers
-            $('#wp-update').click( wpLink.update );
-            $('#wp-cancel').click( function() { tinyMCEPopup.close(); } );
-            $('.query-results').delegate('li', 'click', wpLink.selectInternalLink );
-            $('.query-results').scroll( wpLink.maybeLoadRiver );
+            $('#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 );
+            
             inputs.search.keyup( wpLink.searchInternalLinks );
-
+            
+            inputs.dialog.bind('dialogopen', wpLink.refresh);
+        },
+
+        refresh : function() {
+            var e;
+            
+            ed = tinyMCEPopup.editor;
+            
             // If link exists, select proper values.
             if ( e = ed.dom.getParent(ed.selection.getNode(), 'A') ) {
@@ -48 +55 @@
             }
 
+            // Clear previously selected links
+            results.group.find('.selected').removeClass('selected');
             // Focus the URL field
             inputs.url.focus();

trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.js

@@ -1 @@
-(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);
+(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);

trunk/wp-includes/js/tinymce/wp-mce-link.php

@@ -1 +1 @@
 <?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 );
 
-require_once '../../../wp-load.php';
-include './wp-mce-link-includes.php';
+    $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,
+    );
 
-header( 'Content-Type: text/html; charset=' . get_bloginfo( 'charset' ) );
+    $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";
+}
+
+function wp_link_dialog() {
 ?>
-<!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;
-}
-a:link, a:visited {
-    color: #21759b;
-}
-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">
+<div id="wp-link">
 <div id="link-selector">
     <div id="link-options">
@@ -205 +116 @@
 </div>
 <div class="submitbox">
-    <div id="wp-cancel">
+    <div id="wp-link-cancel">
         <a class="submitdelete deletion"><?php _e( 'Cancel' ); ?></a>
     </div>
-    <div id="wp-update">
+    <div id="wp-link-update">
         <a class="button-primary"><?php _e( 'Update' ); ?></a>
     </div>
 </div>
-</body>
-</html>
+</div>
+<?php } ?>

trunk/wp-includes/script-loader.php

@@ -269 +269 @@
         'noShortlink' => __( 'No shortlink available for this page.' ),
     ) );
+    
+    $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' );
 
     if ( is_admin() ) {
@@ -505 +513 @@
     // Admin bar
     $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101117' );
+    
+    // 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' );
 
     foreach ( $rtl_styles as $rtl_style ) {