Ticket #15544: 15544.diff

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

@@ -46 +46 @@
         background: #fff;
         height: 185px;
         overflow: auto;
+        position: relative;
 }
 #wp-link li,
 #wp-link .query-notice {
@@ -104 +105 @@
 #wp-link-update {
         line-height: 23px;
         float: right;
-}
-#wp-link-update a {
-        display: inline-block;
 }
- No newline at end of file

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

@@ -7 +7 @@
                 timeToTriggerRiver: 150,
                 minRiverAJAXDuration: 200,
                 riverBottomThreshold: 5,
+                keySensitivity: 100,
                 lastSearch: '',
                 init : function() {
                         inputs.dialog = $('#wp-link');
-                        inputs.update = $('#wp-link-update a');
+                        inputs.submit = $('#wp-link-submit');
                         // URL
                         inputs.url = $('#url-field');
                         // Secondary options
@@ -24 +25 @@
                         rivers.elements = $('.query-results', inputs.dialog);
 
                         // Bind event handlers
-                        inputs.update.click( wpLink.update );
+                        inputs.dialog.keydown( wpLink.keydown );
+                        inputs.dialog.keyup( wpLink.keyup );
+                        inputs.submit.click( wpLink.update );
                         $('#wp-link-cancel').click( function() { tinyMCEPopup.close(); } );
                         
-                        rivers.elements.delegate('li', 'click', wpLink.selectInternalLink )
+                        // rivers.elements.delegate('li', 'click', wpLink.selectInternalLink );
+                        rivers.elements.bind('river-select', wpLink.updateFields );
                         
                         inputs.search.keyup( wpLink.searchInternalLinks );
                         
@@ -38 +42 @@
                         var e;
                         ed = tinyMCEPopup.editor;
                         
-                        // Clear previously selected links
-                        rivers.elements.find('.selected').removeClass('selected');
+                        // Refresh rivers (clear links, check visibility)
+                        rivers.search.refresh();
+                        rivers.recent.refresh();
                         
                         tinyMCEPopup.restoreSelection();
 
@@ -52 +57 @@
                                 if ( "_blank" == ed.dom.getAttrib(e, 'target') )
                                         inputs.openInNewTab.attr('checked','checked');
                                 // Update save prompt.
-                                inputs.update.text( wpLinkL10n.update );
+                                inputs.submit.val( wpLinkL10n.update );
 
                         // If there's no link, set the default values.
                         } else {
-                                // Set URL and description to defaults.
-                                // Leave the new tab setting as-is.
-                                inputs.url.val('http://');
-                                inputs.title.val('');
+                                wpLink.setDefaultValues();
                                 // Update save prompt.
-                                inputs.update.text( wpLinkL10n.save );
+                                inputs.submit.val( wpLinkL10n.save );
                         }
 
                         tinyMCEPopup.storeSelection();
@@ -141 +143 @@
                         tinyMCEPopup.close();
                 },
 
-                selectInternalLink : function() {
-                        var t = $(this);
-                        if ( t.hasClass('unselectable') )
-                                return;
-                        t.siblings('.selected').removeClass('selected');
-                        t.addClass('selected');
-                        inputs.url.val( t.children('.item-permalink').val() );
-                        inputs.title.val( t.children('.item-title').text() );
+                updateFields : function( e, li ) {
+                        inputs.url.val( li.children('.item-permalink').val() );
+                        inputs.title.val( li.children('.item-title').text() );
                 },
+                setDefaultValues : function() {
+                        // Set URL and description to defaults.
+                        // Leave the new tab setting as-is.
+                        inputs.url.val('http://');
+                        inputs.title.val('');
+                },
 
                 searchInternalLinks : function() {
                         var t = $(this), waiting,
                                 search = t.val();
 
                         if ( search.length > 2 ) {
-                                rivers.recent.element.hide();
-                                rivers.search.element.show();
+                                rivers.recent.hide();
+                                rivers.search.show();
 
                                 // Don't search if the keypress didn't change the title.
                                 if ( wpLink.lastSearch == search )
                                         return;
-
+                                
                                 wpLink.lastSearch = search;
                                 waiting = t.siblings('img.waiting').show();
 
                                 rivers.search.change( search );
                                 rivers.search.ajax( function(){ waiting.hide(); });
                         } else {
-                                rivers.search.element.hide();
-                                rivers.recent.element.show();
+                                rivers.search.hide();
+                                rivers.recent.show();
                         }
                 },
+                
+                next : function() {
+                        rivers.search.next();
+                        rivers.recent.next();
+                },
+                prev : function() {
+                        rivers.search.prev();
+                        rivers.recent.prev();
+                },
+                
+                keydown : function( event ) {
+                        var fn, key = $.ui.keyCode;
+                        
+                        switch( event.which ) {
+                                case key.UP:
+                                        fn = 'prev';
+                                case key.DOWN:
+                                        fn = fn || 'next';
+                                        clearInterval( wpLink.keyInterval );
+                                        wpLink[ fn ]();
+                                        wpLink.keyInterval = setInterval( wpLink[ fn ], wpLink.keySensitivity );
+                                        break;
+                                default:
+                                        return;
+                        }
+                        event.preventDefault();
+                },
+                
+                keyup: function( event ) {
+                        var key = $.ui.keyCode;
+                        
+                        switch( event.which ) {
+                                case key.ENTER:
+                                        wpLink.update();
+                                        break;
+                                case key.UP:
+                                case key.DOWN:
+                                        clearInterval( wpLink.keyInterval );
+                                        break;
+                                default:
+                                        return;
+                        }
+                        event.preventDefault();
+                },
 
                 delayedCallback : function( func, delay ) {
                         var timeoutTriggered, funcTriggered, funcArgs, funcContext;
@@ -205 +252 @@
                 this.waiting = element.find('.river-waiting');
                 
                 this.change( search );
+                this.refresh();
                 
                 element.scroll( function(){ self.maybeLoad(); });
+                element.delegate('li', 'click', function(){ self.select( $(this) ); });
         };
         
         $.extend( River.prototype, {
+                refresh: function() {
+                        this.deselect();
+                        this.visible = this.element.is(':visible');
+                },
+                show: function() {
+                        if ( ! this.visible ) {
+                                this.deselect();
+                                this.element.show();
+                                this.visible = true;
+                        }
+                },
+                hide: function() {
+                        this.element.hide();
+                        this.visible = false;
+                },
+                // Selects a list item and triggers the river-select event.
+                select: function( li ) {
+                        var liHeight, elHeight, liTop, elTop;
+                        
+                        if ( li.hasClass('unselectable') || li == this.selected )
+                                return;
+                        
+                        this.deselect();
+                        this.selected = li.addClass('selected');
+                        // Make sure the element is visible
+                        liHeight = li.outerHeight();
+                        elHeight = this.element.height();
+                        liTop = li.position().top;
+                        elTop = this.element.scrollTop();
+                        
+                        if ( liTop < 0 ) // Make first visible element
+                                this.element.scrollTop( elTop + liTop );
+                        else if ( liTop + liHeight > elHeight ) // Make last visible element
+                                this.element.scrollTop( elTop + liTop - elHeight + liHeight );
+                        
+                        // Trigger the river-select event
+                        this.element.trigger('river-select', [ li, this ]);
+                },
+                deselect: function() {
+                        if ( this.selected )
+                                this.selected.removeClass('selected');
+                        this.selected = false;
+                },
+                prev: function() {
+                        if ( ! this.visible )
+                                return;
+                        
+                        var to;
+                        if ( this.selected ) {
+                                to = this.selected.prev('li');
+                                if ( to.length )
+                                        this.select( to );
+                        }
+                },
+                next: function() {
+                        if ( ! this.visible )
+                                return;
+                        
+                        var to = this.selected ? this.selected.next('li') : $('li:not(.unselectable):first', this.element);
+                        if ( to.length )
+                                this.select( to );
+                },
                 ajax: function( callback ) {
                         var self = this,
                                 delay = this.query.page == 1 ? 0 : wpLink.minRiverAJAXDuration,

wp-admin/includes/internal-linking.php

@@ -70 +70 @@
  */
 function wp_link_dialog() {
 ?>
-<div id="wp-link">
+<div id="wp-link" tabindex="-1">
 <div id="link-selector">
         <div id="link-options">
                 <p class="howto"><?php _e( 'Enter the destination URL:' ); ?></p>
@@ -113 +113 @@
                 <a class="submitdelete deletion" href="#"><?php _e( 'Cancel' ); ?></a>
         </div>
         <div id="wp-link-update">
-                <a class="button-primary" href="#"></a>
+                <?php submit_button( __('Update'), 'primary', 'wp-link-submit', false, array('tabindex' => 100)); ?>
         </div>
 </div>
 </div>