Index: src/wp-includes/css/editor.css
===================================================================
--- src/wp-includes/css/editor.css (revision 36605)
+++ src/wp-includes/css/editor.css (working copy)
@@ -84,8 +84,7 @@
}
.mce-textbox,
-.mce-checkbox i.mce-i-checkbox,
-#wp-link .query-results {
+.mce-checkbox i.mce-i-checkbox {
border: 1px solid #ddd;
-webkit-border-radius: 0;
border-radius: 0;
@@ -1334,11 +1333,6 @@
height: 100%;
}
-#wp-link-wrap.search-panel-visible {
- height: 500px;
- margin-top: -250px;
-}
-
#wp-link-wrap .wp-link-text-field {
display: none;
}
@@ -1406,12 +1400,6 @@
#wp-link-wrap.search-panel-visible #link-selector {
-webkit-overflow-scrolling: touch;
- padding: 0 16px;
- position: absolute;
- top: 36px;
- left: 0;
- right: 0;
- bottom: 44px;
}
#wp-link ol,
@@ -1421,20 +1409,6 @@
padding: 0;
}
-#wp-link-search-toggle:after {
- display: inline-block;
- font: normal 20px/1 dashicons;
- vertical-align: top;
- speak: none;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- content: "\f140";
-}
-
-.search-panel-visible #wp-link-search-toggle:after {
- content: "\f142";
-}
-
#wp-link input[type="text"] {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -1454,17 +1428,12 @@
color: inherit;
}
-#wp-link-search-toggle {
- cursor: pointer;
-}
-
#wp-link label input[type="text"] {
- margin-top: 5px;
+ margin: 5px 0 0;
width: 70%;
}
-#wp-link #link-options label span,
-#wp-link #search-panel label span.search-label {
+#wp-link #link-options label span {
display: inline-block;
width: 80px;
text-align: right;
@@ -1474,27 +1443,6 @@
word-wrap: break-word;
}
-#wp-link .link-search-field {
- float: left;
- width: 250px;
- max-width: 70%;
-}
-
-#wp-link .link-search-wrapper {
- margin: 5px 0 9px;
- display: block;
- overflow: hidden;
-}
-
-#wp-link .link-search-wrapper span {
- float: left;
- margin-top: 4px;
-}
-
-#wp-link .link-search-wrapper .spinner {
- margin-top: 5px;
-}
-
#wp-link .link-target {
padding: 3px 0 0;
white-space: nowrap;
@@ -1506,22 +1454,6 @@
max-width: 70%;
}
-#wp-link .query-results {
- border: 1px #dfdfdf solid;
- margin: 0;
- background: #fff;
- overflow: auto;
- position: absolute;
- left: 16px;
- right: 16px;
- bottom: 16px;
- top: 172px;
-}
-
-.has-text-field #wp-link .query-results {
- top: 205px;
-}
-
#wp-link li {
clear: both;
margin-bottom: 0;
@@ -1532,36 +1464,6 @@
position: relative;
}
-#wp-link .query-notice {
- padding: 0;
- border-bottom: 1px solid #dfdfdf;
- background-color: #f7fcfe;
- color: #000;
-}
-
-#wp-link .query-notice .query-notice-default,
-#wp-link .query-notice .query-notice-hint {
- display: block;
- padding: 6px;
- border-left: 4px solid #00a0d2;
-}
-
-#wp-link .unselectable.no-matches-found {
- padding: 0;
- border-bottom: 1px solid #dfdfdf;
- background-color: #fef7f1;
-}
-
-#wp-link .no-matches-found .item-title {
- display: block;
- padding: 6px;
- border-left: 4px solid #d54e21;
-}
-
-#wp-link .query-results em {
- font-style: normal;
-}
-
#wp-link li:hover {
background: #eaf2fa;
color: #151515;
@@ -1607,20 +1509,6 @@
top: 5px;
}
-#wp-link #search-results,
-#wp-link #search-panel {
- display: none;
-}
-
-#wp-link-wrap.search-panel-visible #search-panel {
- display: block;
-}
-
-#wp-link .river-waiting {
- display: none;
- padding: 10px 0;
-}
-
#wp-link .submitbox {
padding: 8px 16px;
background: #fcfcfc;
@@ -1651,14 +1539,6 @@
margin-top: -140px;
}
- #wp-link-wrap.search-panel-visible .query-results {
- top: 195px;
- }
-
- #wp-link-wrap.search-panel-visible.has-text-field .query-results {
- top: 235px;
- }
-
#link-selector {
padding: 0 16px 60px;
}
@@ -1687,21 +1567,6 @@
-webkit-transition: none;
transition: none;
}
-
- #wp-link-wrap.search-panel-visible {
- height: auto;
- margin-top: 0;
- top: 10px;
- bottom: 10px;
- }
-
- .search-panel-visible #link-selector {
- overflow: auto;
- }
-
- .search-panel-visible #search-panel .query-results {
- position: static;
- }
}
@media screen and ( max-height: 290px ) {
@@ -1718,10 +1583,6 @@
height: calc(100% - 92px);
padding-bottom: 2px;
}
-
- #search-panel .query-results {
- position: static;
- }
}
div.wp-link-preview {
@@ -1782,13 +1643,17 @@
}
}
-.ui-autocomplete.mce-wp-autocomplete {
- z-index: 100100;
- margin-top: 10px;
+.ui-autocomplete.wplink-autocomplete {
+ z-index: 100110;
max-height: 200px;
overflow-y: auto;
}
+.wplink-autocomplete li {
+ clear: both;
+ white-space: normal;
+}
+
/* =Overlay Body
-------------------------------------------------------------- */
Index: src/wp-includes/js/tinymce/plugins/wplink/plugin.js
===================================================================
--- src/wp-includes/js/tinymce/plugins/wplink/plugin.js (revision 36605)
+++ src/wp-includes/js/tinymce/plugins/wplink/plugin.js (working copy)
@@ -310,7 +310,7 @@
},
minLength: 2,
position: {
- my: 'left top+5'
+ my: 'left top+2'
}
} ).autocomplete( 'instance' )._renderItem = function( ul, item ) {
return $( '
' )
@@ -329,7 +329,7 @@
$( input ).autocomplete( 'search' );
} )
.autocomplete( 'widget' )
- .addClass( 'mce-wp-autocomplete' )
+ .addClass( 'wplink-autocomplete' )
.attr( 'role', 'listbox' );
}
Index: src/wp-includes/js/wplink.js
===================================================================
--- src/wp-includes/js/wplink.js (revision 36605)
+++ src/wp-includes/js/wplink.js (working copy)
@@ -1,10 +1,9 @@
-/* global ajaxurl, tinymce, wpLinkL10n, setUserSetting, wpActiveEditor */
+/* global tinymce, wpLinkL10n, wpActiveEditor */
var wpLink;
( function( $ ) {
- var editor, searchTimer, River, Query, correctedURL,
+ var editor, correctedURL,
inputs = {},
- rivers = {},
isTouch = ( 'ontouchend' in document );
function getLink() {
@@ -12,11 +11,6 @@
}
wpLink = {
- timeToTriggerRiver: 150,
- minRiverAJAXDuration: 200,
- riverBottomThreshold: 5,
- keySensitivity: 100,
- lastSearch: '',
textarea: '',
init: function() {
@@ -29,59 +23,95 @@
// Input
inputs.text = $( '#wp-link-text' );
inputs.url = $( '#wp-link-url' );
- inputs.nonce = $( '#_ajax_linking_nonce' );
inputs.openInNewTab = $( '#wp-link-target' );
- inputs.search = $( '#wp-link-search' );
- // Build Rivers
- rivers.search = new River( $( '#search-results' ) );
- rivers.recent = new River( $( '#most-recent-results' ) );
- rivers.elements = inputs.dialog.find( '.query-results' );
+ if ( $.ui && $.ui.autocomplete ) {
+ wpLink.setAutocomplete();
+ }
- // Get search notice text
- inputs.queryNotice = $( '#query-notice-message' );
- inputs.queryNoticeTextDefault = inputs.queryNotice.find( '.query-notice-default' );
- inputs.queryNoticeTextHint = inputs.queryNotice.find( '.query-notice-hint' );
-
- // Bind event handlers
- inputs.dialog.keydown( wpLink.keydown );
- inputs.dialog.keyup( wpLink.keyup );
inputs.submit.click( function( event ) {
event.preventDefault();
wpLink.update();
});
+
inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel a' ).click( function( event ) {
event.preventDefault();
wpLink.close();
});
- $( '#wp-link-search-toggle' ).on( 'click', wpLink.toggleInternalLinking );
+ inputs.url.on( 'paste', function() {
+ setTimeout( wpLink.correctURL, 0 );
+ } );
+ },
- rivers.elements.on( 'river-select', wpLink.updateFields );
+ setAutocomplete: function() {
+ var $input = inputs.url,
+ cache, last;
- // Display 'hint' message when search field or 'query-results' box are focused
- inputs.search.on( 'focus.wplink', function() {
- inputs.queryNoticeTextDefault.hide();
- inputs.queryNoticeTextHint.removeClass( 'screen-reader-text' ).show();
- } ).on( 'blur.wplink', function() {
- inputs.queryNoticeTextDefault.show();
- inputs.queryNoticeTextHint.addClass( 'screen-reader-text' ).hide();
- } );
+ $input.on( 'keydown', function() {
+ $input.removeAttr( 'aria-activedescendant' );
+ } ).autocomplete( {
+ source: function( request, response ) {
+ if ( last === request.term ) {
+ response( cache );
+ return;
+ }
- inputs.search.on( 'keyup input', function() {
- var self = this;
+ if ( /^https?:/.test( request.term ) || request.term.indexOf( '.' ) !== -1 ) {
+ return response();
+ }
- window.clearTimeout( searchTimer );
- searchTimer = window.setTimeout( function() {
- wpLink.searchInternalLinks.call( self );
- }, 500 );
- });
+ $.post( window.ajaxurl, {
+ action: 'wp-link-ajax',
+ page: 1,
+ search: request.term,
+ _ajax_linking_nonce: $( '#_ajax_linking_nonce' ).val()
+ }, function( data ) {
+ cache = data;
+ response( data );
+ }, 'json' );
- inputs.url.on( 'paste', function() {
- setTimeout( wpLink.correctURL, 0 );
- } );
+ last = request.term;
+ },
+ focus: function( event, ui ) {
+ $input.attr( 'aria-activedescendant', 'mce-wp-autocomplete-' + ui.item.ID );
+ },
+ select: function( event, ui ) {
+ $input.val( ui.item.permalink );
- inputs.url.on( 'blur', wpLink.correctURL );
+ if ( inputs.wrap.hasClass( 'has-text-field' ) && tinymce.trim( inputs.text.val() ) === '' ) {
+ inputs.text.val( ui.item.title );
+ }
+
+ return false;
+ },
+ open: function() {
+ $input.attr( 'aria-expanded', 'true' );
+ },
+ close: function() {
+ $input.attr( 'aria-expanded', 'false' );
+ },
+ minLength: 2,
+ position: {
+ my: 'left top+2'
+ }
+ } ).autocomplete( 'instance' )._renderItem = function( ul, item ) {
+ return $( '' )
+ .append( '' + item.title + ' ' + item.info + '' )
+ .appendTo( ul );
+ };
+
+ $input.attr( {
+ 'aria-owns': $input.autocomplete( 'widget' ).attr( 'id' )
+ } )
+ .on( 'focus', function() {
+ $input.autocomplete( 'search' );
+ } )
+ .autocomplete( 'widget' )
+ .addClass( 'wplink-autocomplete' )
+ .attr( 'role', 'listbox' );
+
+
},
// If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://
@@ -150,10 +180,6 @@
refresh: function() {
var text = '';
- // Refresh rivers (clear links, check visibility)
- rivers.search.refresh();
- rivers.recent.refresh();
-
if ( wpLink.isMCE() ) {
wpLink.mceRefresh();
} else {
@@ -185,11 +211,6 @@
inputs.url.focus()[0].select();
}
- // Load the most recent results if this is the first time opening the panel.
- if ( ! rivers.recent.ul.children().length ) {
- rivers.recent.ajax();
- }
-
correctedURL = inputs.url.val().replace( /^http:\/\//, '' );
},
@@ -251,7 +272,7 @@
close: function() {
var linkNode;
-
+
$( document.body ).removeClass( 'modal-open' );
if ( ! wpLink.isMCE() ) {
@@ -405,10 +426,6 @@
editor.nodeChanged();
},
- updateFields: function( e, li ) {
- inputs.url.val( li.children( '.item-permalink' ).val() );
- },
-
setDefaultValues: function() {
var selection,
emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
@@ -435,305 +452,8 @@
// Update save prompt.
inputs.submit.val( wpLinkL10n.save );
- },
-
- searchInternalLinks: function() {
- var t = $( this ), waiting,
- search = t.val();
-
- if ( search.length > 2 ) {
- 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.parent().find( '.spinner' ).addClass( 'is-active' );
-
- rivers.search.change( search );
- rivers.search.ajax( function() {
- waiting.removeClass( 'is-active' );
- });
- } else {
- 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, id;
-
- // Escape key.
- if ( 27 === event.keyCode ) {
- wpLink.close();
- event.stopImmediatePropagation();
- // Tab key.
- } else if ( 9 === event.keyCode ) {
- id = event.target.id;
-
- // wp-link-submit must always be the last focusable element in the dialog.
- // following focusable elements will be skipped on keyboard navigation.
- if ( id === 'wp-link-submit' && ! event.shiftKey ) {
- inputs.close.focus();
- event.preventDefault();
- } else if ( id === 'wp-link-close' && event.shiftKey ) {
- inputs.submit.focus();
- event.preventDefault();
- }
- }
-
- // Up Arrow and Down Arrow keys.
- if ( 38 !== event.keyCode && 40 !== event.keyCode ) {
- return;
- }
-
- if ( document.activeElement &&
- ( document.activeElement.id === 'link-title-field' || document.activeElement.id === 'url-field' ) ) {
- return;
- }
-
- // Up Arrow key.
- fn = 38 === event.keyCode ? 'prev' : 'next';
- clearInterval( wpLink.keyInterval );
- wpLink[ fn ]();
- wpLink.keyInterval = setInterval( wpLink[ fn ], wpLink.keySensitivity );
- event.preventDefault();
- },
-
- keyup: function( event ) {
- // Up Arrow and Down Arrow keys.
- if ( 38 === event.keyCode || 40 === event.keyCode ) {
- clearInterval( wpLink.keyInterval );
- event.preventDefault();
- }
- },
-
- delayedCallback: function( func, delay ) {
- var timeoutTriggered, funcTriggered, funcArgs, funcContext;
-
- if ( ! delay )
- return func;
-
- setTimeout( function() {
- if ( funcTriggered )
- return func.apply( funcContext, funcArgs );
- // Otherwise, wait.
- timeoutTriggered = true;
- }, delay );
-
- return function() {
- if ( timeoutTriggered )
- return func.apply( this, arguments );
- // Otherwise, wait.
- funcArgs = arguments;
- funcContext = this;
- funcTriggered = true;
- };
- },
-
- toggleInternalLinking: function( event ) {
- var visible = inputs.wrap.hasClass( 'search-panel-visible' );
-
- inputs.wrap.toggleClass( 'search-panel-visible', ! visible );
- setUserSetting( 'wplink', visible ? '0' : '1' );
- inputs[ ! visible ? 'search' : 'url' ].focus();
- event.preventDefault();
}
};
- River = function( element, search ) {
- var self = this;
- this.element = element;
- this.ul = element.children( 'ul' );
- this.contentHeight = element.children( '#link-selector-height' );
- this.waiting = element.find('.river-waiting');
-
- this.change( search );
- this.refresh();
-
- $( '#wp-link .query-results, #wp-link #link-selector' ).scroll( function() {
- self.maybeLoad();
- });
- element.on( 'click', 'li', function( event ) {
- self.select( $( this ), event );
- });
- };
-
- $.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, event ) {
- 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, event, 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,
- response = wpLink.delayedCallback( function( results, params ) {
- self.process( results, params );
- if ( callback )
- callback( results, params );
- }, delay );
-
- this.query.ajax( response );
- },
- change: function( search ) {
- if ( this.query && this._search == search )
- return;
-
- this._search = search;
- this.query = new Query( search );
- this.element.scrollTop( 0 );
- },
- process: function( results, params ) {
- var list = '', alt = true, classes = '',
- firstPage = params.page == 1;
-
- if ( ! results ) {
- if ( firstPage ) {
- list += '' +
- wpLinkL10n.noMatchesFound + '';
- }
- } else {
- $.each( results, function() {
- classes = alt ? 'alternate' : '';
- classes += this.title ? '' : ' no-title';
- list += classes ? '' : '';
- list += '';
- list += '';
- list += this.title ? this.title : wpLinkL10n.noTitle;
- list += '' + this.info + '';
- alt = ! alt;
- });
- }
-
- this.ul[ firstPage ? 'html' : 'append' ]( list );
- },
- maybeLoad: function() {
- var self = this,
- el = this.element,
- bottom = el.scrollTop() + el.height();
-
- if ( ! this.query.ready() || bottom < this.contentHeight.height() - wpLink.riverBottomThreshold )
- return;
-
- setTimeout(function() {
- var newTop = el.scrollTop(),
- newBottom = newTop + el.height();
-
- if ( ! self.query.ready() || newBottom < self.contentHeight.height() - wpLink.riverBottomThreshold )
- return;
-
- self.waiting.addClass( 'is-active' );
- el.scrollTop( newTop + self.waiting.outerHeight() );
-
- self.ajax( function() {
- self.waiting.removeClass( 'is-active' );
- });
- }, wpLink.timeToTriggerRiver );
- }
- });
-
- Query = function( search ) {
- this.page = 1;
- this.allLoaded = false;
- this.querying = false;
- this.search = search;
- };
-
- $.extend( Query.prototype, {
- ready: function() {
- return ! ( this.querying || this.allLoaded );
- },
- ajax: function( callback ) {
- var self = this,
- query = {
- action : 'wp-link-ajax',
- page : this.page,
- '_ajax_linking_nonce' : inputs.nonce.val()
- };
-
- if ( this.search )
- query.search = this.search;
-
- this.querying = true;
-
- $.post( ajaxurl, query, function( r ) {
- self.page++;
- self.querying = false;
- self.allLoaded = ! r;
- callback( r, query );
- }, 'json' );
- }
- });
-
$( document ).ready( wpLink.init );
})( jQuery );