<!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>[16393] trunk/wp-includes/js/tinymce: Next pass on internal linking.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16393">16393</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-11-15 23:48:24 +0000 (Mon, 15 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Next pass on internal linking. Functional, but needs styling. props koopersmith, see <a href="http://trac.wordpress.org/ticket/11420">#11420</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkwpincludesjstinymcewpmcelinkincludesphp">trunk/wp-includes/js/tinymce/wp-mce-link-includes.php</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjstinymcepluginswplinkeditor_plugindevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js (16392 => 16393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js 2010-11-15 20:13:05 UTC (rev 16392)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js 2010-11-15 23:48:24 UTC (rev 16393)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> ed.addCommand('WP_Link', function() {
</span><span class="cx"> ed.windowManager.open({
</span><span class="cx"> file : tinymce.baseURL + '/wp-mce-link.php',
</span><del>- width : 320,
- height : 340,
</del><ins>+ width : 480,
+ height : 400,
</ins><span class="cx"> inline : 1
</span><span class="cx"> }, {
</span><span class="cx"> plugin_url : url // Plugin absolute URL
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswplinkeditor_pluginjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js (16392 => 16393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js 2010-11-15 20:13:05 UTC (rev 16392)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/editor_plugin.js 2010-11-15 23:48:24 UTC (rev 16393)
</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:320,height:340,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({file:tinymce.baseURL+"/wp-mce-link.php",width:480,height:400,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)})();
</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 (16392 => 16393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2010-11-15 20:13:05 UTC (rev 16392)
+++ trunk/wp-includes/js/tinymce/plugins/wplink/js/wplink.dev.js 2010-11-15 23:48:24 UTC (rev 16393)
</span><span class="lines">@@ -1,138 +1,51 @@
</span><del>-(function($){
- $.widget('wp.wpTabs', {
- options: {},
- _create: function() {
- var self = this,
- ul = this.element,
- lis = ul.children();
-
- this.active = lis.filter('.wp-tab-active');
- // Calculate panel IDs
- lis.each(function() {
- var panel = self._getPanel( $(this) );
- if ( self.active[0] == this )
- panel.show();
- else
- panel.hide();
- });
-
- ul.delegate('li', 'click.wpTabs', function(e) {
- var li = $(this);
-
- // Prevent any child link from redirecting the page.
- e.preventDefault();
- // Deactivate previous tab.
- self._getPanel( self.active ).hide();
- self.active.removeClass('wp-tab-active');
- self._trigger("hide", e, self.widget() );
-
- // Activate current tab.
- self.active = li.addClass('wp-tab-active');
- self._getPanel( self.active ).show();
- self._trigger("show", e, self.widget() );
- });
- },
- widget: function() {
- return {
- ul: this.element,
- tab: this.active,
- panel: this._getPanel( this.active )
- };
- },
- _setPanel: function( $el ) {
- var panel = $( '#' + $el.children('.wp-tab-for-id').val() );
- $el.data( 'wp-tab-panel', panel );
- return panel;
- },
- _getPanel: function( $el ) {
- var panel = $el.data('wp-tab-panel');
- return ( !panel || !panel.length ) ? this._setPanel( $el ) : panel;
- }
- });
- // Create tab bars by default.
- $(function(){
- $('.wp-tab-bar').wpTabs();
- });
-})(jQuery);
-
</del><span class="cx"> (function($){
</span><del>- var inputs = {}, panels, active, ed,
</del><ins>+ var inputs = {}, results = {}, ed,
</ins><span class="cx"> wpLink = {
</span><span class="cx"> init : function() {
</span><span class="cx"> var e, etarget, eclass;
</span><span class="cx"> // Init shared vars
</span><span class="cx"> ed = tinyMCEPopup.editor;
</span><ins>+
+
+ // URL
+ inputs.url = $('#url-field');
</ins><span class="cx"> // Secondary options
</span><span class="cx"> inputs.title = $('#link-title-field');
</span><span class="cx"> // Advanced Options
</span><span class="cx"> inputs.openInNewTab = $('#link-target-checkbox');
</span><ins>+ inputs.search = $('#search-field');
+ // Result lists
+ results.search = $('#search-results');
+ results.recent = $('#most-recent-results');
</ins><span class="cx">
</span><del>- panels = $('.link-panel');
- active = $('.link-panel-active');
- $('#link-panel-tab-bar').wpTabs({
- show: function(e, widget) {
- active = widget.panel;
- active.addClass('link-panel-active');
- wpLink.maybeLoadPanel();
- },
- hide: function(e, widget) {
- active.removeClass('link-panel-active');
- }
- })
-
- panels.each( function(){
- var linkType = this.id.replace(/^link-panel-id-/,''),
- parts = linkType.split('-');
- $(this).data( 'link-type', {
- full : linkType,
- type : parts[0],
- name : parts[1] || ''
- });
- });
-
</del><span class="cx"> // Bind event handlers
</span><span class="cx"> $('#wp-update').click( wpLink.update );
</span><span class="cx"> $('#wp-cancel').click( function() { tinyMCEPopup.close(); } );
</span><del>- $('.link-panel .wp-tab-bar').wpTabs('option', 'show', wpLink.maybeLoadPanel );
- $('.link-panel .wp-tab-panel').delegate('li', 'click', wpLink.selectInternalLink );
- $('.wp-tab-panel-pagelinks').delegate('a', 'click', wpLink.selectPageLink );
- $('.link-panel .link-search-field').keyup( wpLink.searchInternalLinks );
</del><ins>+ $('.query-results').delegate('li', 'click', wpLink.selectInternalLink );
+ $('.wp-results-pagelinks').delegate('a', 'click', wpLink.selectPageLink );
+ inputs.search.keyup( wpLink.searchInternalLinks );
</ins><span class="cx">
</span><del>- active.find('input.url-field').focus();
-
</del><span class="cx"> // If link exists, select proper values.
</span><del>- e = ed.dom.getParent(ed.selection.getNode(), 'A');
- if ( ! e )
- return;
-
- active.find('input.url-field').val( e.href );
- inputs.title.val( ed.dom.getAttrib(e, 'title') );
- // Advanced Options
-
- if ( "_blank" == ed.dom.getAttrib(e, 'target') )
- inputs.openInNewTab.attr('checked','checked');
</del><ins>+ if ( e = ed.dom.getParent(ed.selection.getNode(), 'A') ) {
+ // Set URL and description.
+ inputs.url.val( e.href );
+ inputs.title.val( ed.dom.getAttrib(e, 'title') );
+ // Set open in new tab.
+ if ( "_blank" == ed.dom.getAttrib(e, 'target') )
+ inputs.openInNewTab.attr('checked','checked');
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> update : function() {
</span><span class="cx"> var el,
</span><span class="cx"> ed = tinyMCEPopup.editor,
</span><span class="cx"> attrs = {
</span><ins>+ href : inputs.url.val(),
</ins><span class="cx"> title : inputs.title.val(),
</span><span class="cx"> target : inputs.openInNewTab.attr('checked') ? '_blank' : ''
</span><del>- }, defaultContent, e, b;
</del><ins>+ }, e, b,
+ defaultContent = attrs.title ? attrs.title : attrs.href;
</ins><span class="cx">
</span><del>- if ( active.hasClass('link-panel-custom') ) {
- attrs.href = active.find('input.url-field').val();
- defaultContent = attrs.href;
- } else {
- el = active.find('li.selected:visible');
- if ( !el.length )
- return;
-
- attrs.href = el.children('input').val();
- defaultContent = el.text();
- }
-
</del><span class="cx"> tinyMCEPopup.restoreSelection();
</span><span class="cx"> e = ed.dom.getParent(ed.selection.getNode(), 'A');
</span><span class="cx">
</span><span class="lines">@@ -190,47 +103,14 @@
</span><span class="cx"> tinyMCEPopup.close();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- maybeLoadPanel : function() {
- var panel = active.find('.wp-tab-panel:visible');
- if ( panel.length && panel.find('.wp-tab-panel-loading').length )
- wpLink.linkPanelAJAX( panel );
- },
-
- linkPanelAJAX : function( $panel, params, callback ) {
- if ( ! $panel.hasClass('wp-tab-panel') )
- $panel = $panel.parents('.wp-tab-panel');
-
- if ( ! $panel.length )
- return;
-
- var query = $panel.children('.wp-tab-panel-query').val();
-
- wpLink.linkAJAX( $panel, $.extend({
- preset : query,
- page : 'all' == query ? 1 : 0
- }, params), function(r, lt) {
- var pagelinks = $panel.children('.wp-tab-panel-pagelinks');
-
- // Set results
- $panel.children('ul').html( wpLink.generateListMarkup( r['results'], lt ) );
-
- // Handle page links
- if ( r['page_links'] )
- pagelinks.html( r['page_links'] ).show();
- else
- pagelinks.hide();
- // Run callback
- if ( callback )
- callback(r, lt);
- })
- },
-
</del><span class="cx"> selectInternalLink : function() {
</span><span class="cx"> var t = $(this);
</span><span class="cx"> if ( t.hasClass('unselectable') )
</span><span class="cx"> return;
</span><span class="cx"> t.siblings('.selected').removeClass('selected');
</span><span class="cx"> t.addClass('selected');
</span><ins>+ inputs.url.val( t.children('.item-permalink').val() );
+ inputs.title.val( t.children('.item-title').text() );
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> selectPageLink : function(e) {
</span><span class="lines">@@ -239,37 +119,62 @@
</span><span class="cx"> page = page ? page[1] : 1; // If there's no match, it's the first page.
</span><span class="cx"> e.preventDefault(); // Prevent the link from redirecting.
</span><span class="cx">
</span><del>- wpLink.linkPanelAJAX( $(this), { page : page });
</del><ins>+ wpLink.linkAJAX( $(this), { page : page });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> searchInternalLinks : function() {
</span><del>- var t = $(this),
</del><ins>+ var t = $(this), waiting,
+ title = t.val();
+
+ if ( title ) {
+ results.recent.hide();
+ results.search.show();
</ins><span class="cx"> waiting = t.siblings('img.waiting').show();
</span><del>-
- wpLink.linkPanelAJAX( t, { title : t.val() }, function(){ waiting.hide(); });
</del><ins>+ wpLink.linkAJAX( results.search, { title : title }, function(){ waiting.hide(); });
+ } else {
+ results.search.hide();
+ results.recent.show();
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- linkAJAX : function( el, params, callback ) {
- var linkType = el.parents('.link-panel').data('link-type');
</del><ins>+ linkAJAX : function( $panel, params, callback ) {
+ if ( ! $panel.hasClass('query-results') )
+ $panel = $panel.parents('.query-results');
+
+ if ( ! $panel.length )
+ return;
+
</ins><span class="cx"> $.post( ajaxurl, $.extend({
</span><del>- action : 'wp-link-ajax',
- type : linkType.type,
- name : linkType.name
</del><ins>+ action : 'wp-link-ajax'
</ins><span class="cx"> }, params ), function(r) {
</span><del>- return callback(r, linkType);
</del><ins>+ var pagelinks = $panel.children('.wp-results-pagelinks');
+
+ // Set results
+ $panel.children('ul').html( wpLink.generateListMarkup( r['results'] ) );
+
+ // Handle page links
+ if ( r['page_links'] )
+ pagelinks.html( r['page_links'] ).show();
+ else
+ pagelinks.hide();
+
+ // Run callback
+ if ( callback )
+ callback( r['results'] );
</ins><span class="cx"> }, "json" );
</span><span class="cx"> },
</span><span class="cx">
</span><del>- generateListMarkup : function( results, linkType ) {
</del><ins>+ generateListMarkup : function( results ) {
</ins><span class="cx"> var s = '';
</span><span class="cx">
</span><span class="cx"> if ( ! results )
</span><del>- return '<li class="no-matches-found unselectable"><em>' + wpLinkL10n.noMatchesFound + '</em></li>';
</del><ins>+ return '<li class="no-matches-found unselectable"><span class="item-title"><em>' + wpLinkL10n.noMatchesFound + '</em></span></li>';
</ins><span class="cx">
</span><span class="cx"> $.each( results, function() {
</span><del>- s+= '<li id="link-to-' + linkType.full + '-' + this['ID'] + '">';
- s+= '<input type="hidden" value="' + this['permalink'] + '" />';
</del><ins>+ s+= '<li><input type="hidden" class="item-permalink" value="' + this['permalink'] + '" />';
+ s+= '<span class="item-title">'
</ins><span class="cx"> s+= this['title'] ? this['title'] : '<em>'+ wpLinkL10n.untitled + '</em>';
</span><ins>+ s+= '</span><span class="item-info">' + this['info'] + '</span>';
</ins><span class="cx"> s+= '</li>';
</span><span class="cx"> });
</span><span class="cx"> return s;
</span></span></pre></div>
<a id="trunkwpincludesjstinymcewpmcelinkincludesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/wp-mce-link-includes.php (16392 => 16393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-link-includes.php 2010-11-15 20:13:05 UTC (rev 16392)
+++ trunk/wp-includes/js/tinymce/wp-mce-link-includes.php 2010-11-15 23:48:24 UTC (rev 16393)
</span><span class="lines">@@ -1,151 +1,35 @@
</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>-class WP_Tab_Bar {
- var $tabs = array();
-
- var $id = '';
- var $classes = array();
-
- var $selected = '';
-
- function add( $id, $label, $url='' ) {
- array_push( $this->tabs, array(
- 'label' => $label,
- 'for' => $id,
- 'url' => $url
- ));
- }
-
- function select( $id ) {
- $this->selected = $id;
- }
-
- function render( $echo=true ) {
- if ( empty( $this->selected ) )
- $this->selected = $this->tabs[0]['for'];
-
- array_unshift( $this->classes, 'wp-tab-bar' );
-
- $out = "<ul id='$this->id' class='" . esc_attr( implode( ' ', $this->classes ) ) . "'>";
- foreach( $this->tabs as $tab ) {
- if ( !isset($tab['url']) )
- $tab['url'] = '';
-
- $out.= "<li class='";
- $out.= $this->selected == $tab['for'] ? 'wp-tab-active' : '';
- $out.= "'><input type='hidden' class='wp-tab-for-id' value='{$tab['for']}' />";
- $out.= "<a href='{$tab['url']}#{$tab['for']}'>";
- $out.= "{$tab['label']}</a></li>";
- }
- $out.= "</ul>";
-
- if ( $echo )
- echo $out;
-
- return $out;
- }
-}
-
-function wp_link_panel_custom() { ?>
- <div id="link-panel-id-custom" class="link-panel link-panel-custom link-panel-active">
- <input type="hidden" class="link-panel-type" value="custom" />
- <label>
- <span><?php _e('URL:'); ?></span><input class="url-field" type="text" />
- </label>
- </div>
-<?php }
-
-function wp_link_panel_structure( $panel_type, $name, $queries ) {
- $id = $panel_type . '-' . $name;
-
- ?>
- <div id="link-panel-id-<?php echo $id; ?>" class="link-panel link-panel-<?php echo $panel_type; ?>">
- <!-- <input type="hidden" class="link-panel-type" value="<?php echo $panel_type; ?>" /> -->
- <!-- <input type="hidden" class="link-panel-id" value="" /> -->
- <?php
-
- $tb = new WP_Tab_Bar();
- foreach( $queries as $i => $query ) {
- $queries[$i]['id'] = "$id-{$query['preset']}";
- $tb->add( $queries[$i]['id'], $query['label'] );
- }
- $tb->render();
-
- foreach( $queries as $query ): ?>
- <div id="<?php echo $query['id']; ?>" class="wp-tab-panel">
- <input type="hidden" class="wp-tab-panel-query" value="<?php echo $query['preset']; ?>" />
-
- <?php if ( 'search' == $query['preset'] ): ?>
- <label for="<?php echo $id; ?>-search-field" class="link-search-wrapper">
- <span><?php _e('Search:'); ?></span>
- <input type="text" id="<?php echo $id; ?>-search-field" class="link-search-field" />
- <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
- </label>
- <ul id="<?php echo $id; ?>-search-results" class="link-search-results"></ul>
-
- <?php else: ?>
- <div class="wp-tab-panel-pagelinks wp-tab-panel-pagelinks-top"></div>
- <ul>
- <li class="wp-tab-panel-loading unselectable"><em><?php _e('Loading...'); ?></em></li>
- </ul>
- <div class="wp-tab-panel-pagelinks wp-tab-panel-pagelinks-bottom"></div>
- <?php endif; ?>
- </div>
- <?php endforeach; ?>
- </div>
-<?php }
-
-function wp_link_query_post_type( $pt_obj, $preset='all', $opts=array() ) {
- $args_base = array(
- 'post_type' => $pt_obj->name,
</del><ins>+ $query = array(
+ 'post_type' => $pt_names,
</ins><span class="cx"> 'suppress_filters' => true,
</span><span class="cx"> 'update_post_term_cache' => false,
</span><span class="cx"> 'update_post_meta_cache' => false,
</span><span class="cx"> 'post_status' => 'publish',
</span><ins>+ 'order' => 'DESC',
+ 'orderby' => 'post_date',
+ 'posts_per_page' => 20,
</ins><span class="cx"> );
</span><del>-
- switch( $preset ) {
- case 'all':
- $args = array_merge( $args_base, array(
- 'order' => 'ASC',
- 'orderby' => 'title',
- 'posts_per_page' => 20,
- ));
- break;
- case 'recent':
- $args = array_merge( $args_base, array(
- 'order' => 'DESC',
- 'orderby' => 'post_date',
- 'posts_per_page' => 15,
- ));
- break;
- case 'search':
- $args = array_merge( $args_base, array(
- 's' => isset($opts['search']) ? $opts['search'] : '',
- 'posts_per_page' => 10
- ));
- break;
- }
-
- // Handle pages if a page number is specified.
- if ( isset( $opts['pagenum'] ) && isset( $args['posts_per_page'] ) ) {
- $pages = array(
- 'current' => $opts['pagenum'],
- 'per_page' => $args['posts_per_page']
- );
-
- if ( ! isset( $args['offset'] ) )
- $args['offset'] = 0 < $opts['pagenum'] ? $args['posts_per_page'] * ( $opts['pagenum'] - 1 ) : 0;
- $pages['offset'] = $args['offset'];
- }
-
- // Allow args to be extended.
- if ( isset( $opts['args'] ) )
- $args = array_merge( $args, $opts['args'] );
-
</del><ins>+
+ $args['pagenum'] = isset( $args['pagenum'] ) ? absint( $args['pagenum'] ) : 1;
+
+ if ( isset( $args['s'] ) )
+ $query['s'] = $args['s'];
+
+ $pagination = array(
+ 'current' => $args['pagenum'],
+ 'per_page' => $query['posts_per_page'],
+ );
+
+ $query['offset'] = $pagination['offset'] = $args['pagenum'] > 1 ? $query['posts_per_page'] * ( $args['pagenum'] - 1 ) : 0;
+
</ins><span class="cx"> // Do main query.
</span><span class="cx"> $get_posts = new WP_Query;
</span><del>- $posts = $get_posts->query( $args );
</del><ins>+ $posts = $get_posts->query( $query );
</ins><span class="cx"> // Check if any posts were found.
</span><span class="cx"> if ( ! $get_posts->post_count )
</span><span class="cx"> return false;
</span><span class="lines">@@ -153,57 +37,49 @@
</span><span class="cx"> // Build results.
</span><span class="cx"> $results = array();
</span><span class="cx"> foreach ( $posts as $post ) {
</span><ins>+ if ( 'post' == $post->post_type )
+ $info = mysql2date( __( 'Y/m/d' ), $post->post_date );
+ else
+ $info = $pts[ $post->post_type ]->labels->singular_name;
+
</ins><span class="cx"> $results[] = array(
</span><span class="cx"> 'ID' => $post->ID,
</span><del>- 'title' => $post->post_title,
- 'permalink' => get_permalink( $post->ID )
- );
</del><ins>+ 'title' => esc_html( strip_tags($post->post_title) ),
+ 'permalink' => get_permalink( $post->ID ),
+ 'info' => $info,
+ );;
</ins><span class="cx"> }
</span><ins>+
+ // Remaining pagination values.
+ $pagination['max'] = $get_posts->max_num_pages;
+ $pagination['page_links'] = paginate_links( array(
+ 'prev_text' => __('&laquo;'),
+ 'next_text' => __('&raquo;'),
+ 'total' => $pagination['max'],
+ 'current' => $pagination['current']
+ ) );
+
</ins><span class="cx"> // Build response.
</span><span class="cx"> $resp = array(
</span><span class="cx"> 'query' => $get_posts,
</span><span class="cx"> 'objects' => $posts,
</span><del>- 'results' => $results
</del><ins>+ 'results' => $results,
+ 'pages' => $pagination,
</ins><span class="cx"> );
</span><del>-
- // Set remaining pages values.
- if ( isset( $pages ) ) {
- $pages['max'] = $resp['query']->max_num_pages;
- $pages['page_links'] = paginate_links( array(
- 'prev_text' => __('&laquo;'),
- 'next_text' => __('&raquo;'),
- 'total' => $pages['max'],
- 'current' => $pages['current']
- ));
- $resp['pages'] = $pages;
- }
-
</del><ins>+
</ins><span class="cx"> return $resp;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_link_ajax( $request ) {
</span><del>- if ( !isset($request['type']) || !isset($request['name']) || !isset($request['preset']) )
- die('-1');
</del><ins>+ // Searches have a title term.
+ if ( isset( $request['title'] ) )
+ $args['s'] = stripslashes( $request['title'] );
+ $args['pagenum'] = ! empty( $request['page'] ) ? absint( $request['page'] ) : 1;
</ins><span class="cx">
</span><del>- // Run only presets we recognize.
- if ( 'pt' != $request['type'] || ! in_array( $request['preset'], array('all','search','recent') ) )
- die('-1');
- // Searches must have a search term.
- else if ( 'search' == $request['preset'] && !isset($request['title']) )
- die('-1');
</del><ins>+ $resp = wp_link_query( $args );
</ins><span class="cx">
</span><del>- $opts = array();
- if ( 'search' == $request['preset'] ) {
- $opts['search'] = $request['title'];
- } else if ( ! empty( $request['page'] ) ) {
- $opts['pagenum'] = $request['page'];
- }
-
- if ( 'pt' == $request['type'] && $obj = get_post_type_object($request['name']) )
- $resp = wp_link_query_post_type( $obj, $request['preset'], $opts );
-
</del><span class="cx"> if ( ! isset( $resp ) )
</span><del>- die('0');
</del><ins>+ die( '0' );
</ins><span class="cx">
</span><span class="cx"> $json = array( 'results' => $resp['results'] );
</span><span class="cx"> if ( isset( $resp['pages'] ) && !empty( $resp['pages']['page_links'] ) )
</span><span class="lines">@@ -212,4 +88,5 @@
</span><span class="cx"> echo json_encode( $json );
</span><span class="cx"> echo "\n";
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> ?>
</span><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 (16392 => 16393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/wp-mce-link.php 2010-11-15 20:13:05 UTC (rev 16392)
+++ trunk/wp-includes/js/tinymce/wp-mce-link.php 2010-11-15 23:48:24 UTC (rev 16393)
</span><span class="lines">@@ -23,8 +23,12 @@
</span><span class="cx"> <?php
</span><span class="cx"> wp_print_scripts( array('jquery', 'jquery-ui-widget') );
</span><span class="cx"> ?>
</span><del>-<script type="text/javascript" src="plugins/wplink/js/wplink.js?ver=20101023"></script>
</del><span class="cx"> <?php
</span><ins>+ $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
+ $src = "plugins/wplink/js/wplink$suffix.js?ver=20101023";
+?>
+<script type="text/javascript" src="<?php echo $src; ?>"></script>
+<?php
</ins><span class="cx"> wp_admin_css( 'global', true );
</span><span class="cx"> wp_admin_css( 'wp-admin', true );
</span><span class="cx"> register_admin_color_schemes();
</span><span class="lines">@@ -43,26 +47,11 @@
</span><span class="cx"> height: 2em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#link-header,
</del><span class="cx"> #link-options,
</span><span class="cx"> #link-advanced-options {
</span><span class="cx"> padding: 5px;
</span><span class="cx"> border-bottom: 1px solid #dfdfdf;
</span><span class="cx"> }
</span><del>- #link-header {
- padding-bottom: 0;
- background: #fff;
- }
- #link-panel-tab-bar li {
- font-weight: bold;
- border: #dfdfdf solid;
- margin-right: 5px;
- border-width: 1px 1px 0;
- }
- #link-panel-tab-bar .wp-tab-active {
- border-color:#ccc;
- background-color: #f1f1f1;
- }
</del><span class="cx">
</span><span class="cx"> #link-type {
</span><span class="cx"> width: 140px;
</span><span class="lines">@@ -77,12 +66,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> label input[type="text"] {
</span><del>- width: 220px;
</del><ins>+ width: 360px;
+ margin-top: 5px;
</ins><span class="cx"> }
</span><del>- .wp-tab-panel label input[type="text"] {
- float: left;
- width: 200px;
- }
</del><span class="cx">
</span><span class="cx"> label span {
</span><span class="cx"> display: inline-block;
</span><span class="lines">@@ -90,20 +76,21 @@
</span><span class="cx"> text-align: right;
</span><span class="cx"> padding-right: 5px;
</span><span class="cx"> }
</span><del>- .wp-tab-panel label span {
- width: auto;
- text-align: left;
- float: left;
- margin-top: 3px;
- }
</del><span class="cx"> .link-search-wrapper {
</span><span class="cx"> padding: 5px;
</span><del>- border-bottom: solid 1px #dfdfdf;
</del><span class="cx"> display: block;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> }
</span><ins>+ .link-search-wrapper span {
+ float: left;
+ margin-top: 6px;
+ }
+ .link-search-wrapper input[type="text"] {
+ float: left;
+ width: 220px;
+ }
</ins><span class="cx"> .link-search-wrapper img.waiting {
</span><del>- margin: 4px 1px 0 4px;
</del><ins>+ margin: 8px 1px 0 4px;
</ins><span class="cx"> float: left;
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="lines">@@ -116,9 +103,53 @@
</span><span class="cx"> margin-left: 10px;
</span><span class="cx"> font-size: 11px;
</span><span class="cx"> }
</span><ins>+
+.query-results {
+ border: #dfdfdf solid;
+ border-width: 1px 0;
+ margin: 5px 0;
+ background: #fff;
+ height: 220px;
+ overflow: auto;
+}
+ .query-results li {
+ margin-bottom: 0;
+ border-bottom: 1px solid #dfdfdf;
+ color: #555;
+ padding: 4px 6px;
+ cursor: pointer;
+ }
+ .query-results li:hover {
+ background: #EAF2FA;
+ color: #333;
+ }
+ .query-results li.selected {
+ background: #f1f1f1;
+ font-weight: bold;
+ color: #333;
+ }
+.item-info {
+ text-transform: uppercase;
+ color: #aaa;
+ font-weight: bold;
+ font-size: 11px;
+ float: right;
+}
+#search-results {
+ display: none;
+}
+
+.wp-results-pagelinks {
+ padding:4px 0;
+ margin:0 auto;
+ text-align:center;
+}
+ .wp-results-pagelinks-top {
+ border-bottom: 1px solid #dfdfdf;
+ }
</ins><span class="cx">
</span><span class="cx"> .submitbox {
</span><del>- padding: 5px;
</del><ins>+ padding: 5px 5px 0;
</ins><span class="cx"> font-size: 11px;
</span><span class="cx"> overflow: auto;
</span><span class="cx"> height: 29px;
</span><span class="lines">@@ -134,71 +165,18 @@
</span><span class="cx"> #wp-update a {
</span><span class="cx"> display: inline-block;
</span><span class="cx"> }
</span><del>-.wp-tab-active,
-.wp-tab-panel {
- background: #fff;
-}
- .wp-tab-panel {
- height: 160px;
- padding: 0;
- }
-.wp-tab-panel li {
- margin-bottom: 0;
- border-bottom: 1px solid #dfdfdf;
- color: #555;
- padding: 4px 6px;
- cursor: pointer;
-}
- .wp-tab-panel li:hover {
- background: #EAF2FA;
- color: #333;
- }
- .wp-tab-panel li.selected {
- background: #f1f1f1;
- font-weight: bold;
- color: #333;
- }
-.wp-tab-panel-pagelinks {
- display: none;
- padding:4px 0;
- margin:0 auto;
- text-align:center;
-}
- .wp-tab-panel-pagelinks-top {
- border-bottom: 1px solid #dfdfdf;
- }
</del><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <?php
</span><del>-// @TODO: Support custom post types.
-// $pts = get_post_types( array( 'public' => true ), 'objects' );
-$pts = array( get_post_type_object( 'post' ), get_post_type_object( 'page' ) );
-$queries = array(
- array( 'preset' => 'all', 'label' => __('View All') ),
- array( 'preset' => 'recent', 'label' => __('Most Recent') ),
- array( 'preset' => 'search', 'label' => __('Search') )
-);
</del><span class="cx">
</span><del>-$tb = new WP_Tab_Bar();
-$tb->id = 'link-panel-tab-bar';
-$tb->add( 'link-panel-id-custom', __('External Link') );
-foreach( $pts as $pt ) {
- $tb->add( "link-panel-id-pt-$pt->name", $pt->labels->singular_name );
-}
</del><span class="cx">
</span><del>-
</del><span class="cx"> ?>
</span><span class="cx"> <body id="post-body">
</span><del>-<div id="link-header">
- <?php $tb->render(); ?>
-</div>
</del><span class="cx"> <div id="link-selector">
</span><del>- <?php
- wp_link_panel_custom();
- foreach( $pts as $pt )
- wp_link_panel_structure('pt', $pt->name, $queries);
- ?>
</del><span class="cx"> <div id="link-options">
</span><ins>+ <label for="url-field">
+ <span><?php _e('URL:'); ?></span><input id="url-field" type="text" />
+ </label>
</ins><span class="cx"> <label for="link-title-field">
</span><span class="cx"> <span><?php _e('Description:'); ?></span><input id="link-title-field" type="text" />
</span><span class="cx"> </label>
</span><span class="lines">@@ -206,6 +184,40 @@
</span><span class="cx"> <input type="checkbox" id="link-target-checkbox" /><span><?php _e('Open in new tab'); ?></span>
</span><span class="cx"> </label>
</span><span class="cx"> </div>
</span><ins>+ <div id="search-panel">
+ <label for="search-field" class="link-search-wrapper">
+ <span><?php _e('Search:'); ?></span>
+ <input type="text" id="search-field" class="link-search-field" />
+ <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+ </label>
+
+ <div id="search-results" class="query-results">
+ <div class="wp-results-pagelinks wp-results-pagelinks-top"></div>
+ <ul>
+ <li class="wp-results-loading unselectable"><em><?php _e('Loading...'); ?></em></li>
+ </ul>
+ <div class="wp-results-pagelinks wp-results-pagelinks-bottom"></div>
+ </div>
+
+ <?php $most_recent = wp_link_query(); ?>
+ <div id="most-recent-results" class="query-results">
+ <div class="wp-results-pagelinks wp-results-pagelinks-top">
+ <?php echo $most_recent['pages']['page_links']; ?>
+ </div>
+ <ul>
+ <?php foreach ( $most_recent['results'] as $item ): ?>
+ <li>
+ <input type="hidden" class="item-permalink" value="<?php echo esc_url( $item['permalink'] ); ?>" />
+ <span class="item-title"><?php echo $item['title']; ?></span>
+ <span class="item-info"><?php echo esc_html( $item['info'] ); ?></span>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ <div class="wp-results-pagelinks wp-results-pagelinks-bottom">
+ <?php echo $most_recent['pages']['page_links']; ?>
+ </div>
+ </div>
+ </div>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="submitbox">
</span><span class="cx"> <div id="wp-cancel">
</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>
</div>
</body>
</html>