Index: src/wp-includes/css/editor.css
===================================================================
--- src/wp-includes/css/editor.css (revision 37153)
+++ src/wp-includes/css/editor.css (working copy)
@@ -95,7 +95,8 @@
}
.mce-textbox,
-.mce-checkbox i.mce-i-checkbox {
+.mce-checkbox i.mce-i-checkbox,
+#wp-link .query-results {
border: 1px solid #ddd;
-webkit-border-radius: 0;
border-radius: 0;
@@ -1374,6 +1375,11 @@
height: 100%;
}
+#wp-link-wrap {
+ height: 500px;
+ margin-top: -250px;
+}
+
#wp-link-wrap .wp-link-text-field {
display: none;
}
@@ -1433,8 +1439,14 @@
0 0 2px 1px rgba(30, 140, 190, .8);
}
-#link-selector {
- padding: 0 16px 50px;
+#wp-link-wrap #link-selector {
+ -webkit-overflow-scrolling: touch;
+ padding: 0 16px;
+ position: absolute;
+ top: 37px;
+ left: 0;
+ right: 0;
+ bottom: 44px;
}
#wp-link ol,
@@ -1464,11 +1476,12 @@
}
#wp-link label input[type="text"] {
- margin: 8px 0 0;
+ margin-top: 5px;
width: 70%;
}
-#wp-link #link-options label span {
+#wp-link #link-options label span,
+#wp-link #search-panel label span.search-label {
display: inline-block;
width: 80px;
text-align: right;
@@ -1478,6 +1491,27 @@
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;
@@ -1489,6 +1523,112 @@
max-width: 70%;
}
+#wp-link .query-results {
+ border: 1px #dfdfdf solid;
+ margin: 0 0 12px;
+ background: #fff;
+ overflow: auto;
+ position: absolute;
+ left: 16px;
+ right: 16px;
+ bottom: 0;
+ top: 166px;
+}
+
+.has-text-field #wp-link .query-results {
+ top: 200px;
+}
+
+#wp-link li {
+ clear: both;
+ margin-bottom: 0;
+ border-bottom: 1px solid #f1f1f1;
+ color: #32373c;
+ padding: 4px 6px 4px 10px;
+ cursor: pointer;
+ 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;
+}
+
+#wp-link li.unselectable {
+ border-bottom: 1px solid #dfdfdf;
+}
+
+#wp-link li.unselectable:hover {
+ background: #fff;
+ cursor: auto;
+ color: #32373c;
+}
+
+#wp-link li.selected {
+ background: #ddd;
+ color: #32373c;
+}
+
+#wp-link li.selected .item-title {
+ font-weight: bold;
+}
+
+#wp-link li:last-child {
+ border: none;
+}
+
+#wp-link .item-title {
+ display: inline-block;
+ width: 80%;
+ width: -webkit-calc(100% - 68px);
+ width: calc(100% - 68px);
+ word-wrap: break-word;
+}
+
+#wp-link .item-info {
+ text-transform: uppercase;
+ color: #666;
+ font-size: 11px;
+ position: absolute;
+ right: 5px;
+ top: 5px;
+}
+
+#wp-link .river-waiting {
+ display: none;
+ padding: 10px 0;
+}
+
#wp-link .submitbox {
padding: 8px 16px;
background: #fcfcfc;
@@ -1518,10 +1658,22 @@
margin-top: -140px;
}
+ #wp-link-wrap .query-results {
+ top: 195px;
+ }
+
+ #wp-link-wrap.has-text-field .query-results {
+ top: 235px;
+ }
+
#link-selector {
padding: 0 16px 60px;
}
+ #wp-link-wrap #link-selector {
+ bottom: 52px;
+ }
+
#wp-link-cancel {
line-height: 32px;
}
@@ -1549,7 +1701,19 @@
#wp-link-wrap {
-webkit-transition: none;
transition: none;
+ height: auto;
+ margin-top: 0;
+ top: 10px;
+ bottom: 10px;
}
+
+ #link-selector {
+ overflow: auto;
+ }
+
+ #search-panel .query-results {
+ position: static;
+ }
}
@media screen and ( max-height: 290px ) {
@@ -1566,6 +1730,10 @@
height: calc(100% - 92px);
padding-bottom: 2px;
}
+
+ #search-panel .query-results {
+ position: static;
+ }
}
div.wp-link-preview {
Index: src/wp-includes/js/wplink.js
===================================================================
--- src/wp-includes/js/wplink.js (revision 37153)
+++ src/wp-includes/js/wplink.js (working copy)
@@ -1,9 +1,11 @@
-
var wpLink;
( function( $, wpLinkL10n, wp ) {
- var editor, correctedURL, linkNode,
+ var editor, searchTimer, River, Query, correctedURL, linkNode,
+ emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
+ urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i,
inputs = {},
+ rivers = {},
isTouch = ( 'ontouchend' in document );
function getLink() {
@@ -11,6 +13,11 @@
}
wpLink = {
+ timeToTriggerRiver: 150,
+ minRiverAJAXDuration: 200,
+ riverBottomThreshold: 5,
+ keySensitivity: 100,
+ lastSearch: '',
textarea: '',
init: function() {
@@ -23,14 +30,24 @@
// 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' );
- if ( $.ui && $.ui.autocomplete ) {
- wpLink.setAutocomplete();
- }
+ // Build Rivers
+ rivers.search = new River( $( '#search-results' ) );
+ rivers.recent = new River( $( '#most-recent-results' ) );
+ rivers.elements = inputs.dialog.find( '.query-results' );
- inputs.dialog.on( 'keydown', wpLink.keydown );
- inputs.submit.on( 'click', function( event ) {
+ // 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();
});
@@ -40,105 +57,29 @@
wpLink.close();
});
+ rivers.elements.on( 'river-select', wpLink.updateFields );
+
+ // 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();
+ } );
+
+ inputs.search.on( 'keyup input', function() {
+ window.clearTimeout( searchTimer );
+ searchTimer = window.setTimeout( function() {
+ wpLink.searchInternalLinks();
+ }, 500 );
+ });
+
inputs.url.on( 'paste', function() {
setTimeout( wpLink.correctURL, 0 );
} );
- },
- setAutocomplete: function() {
- var $input = inputs.url,
- cache, last;
-
- $input.on( 'keydown', function() {
- $input.removeAttr( 'aria-activedescendant' );
- } ).autocomplete( {
- source: function( request, response ) {
- if ( last === request.term ) {
- response( cache );
- return;
- }
-
- if ( /^https?:/.test( request.term ) || request.term.indexOf( '.' ) !== -1 ) {
- return response();
- }
-
- $.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' );
-
- last = request.term;
- },
- focus: function( event, ui ) {
- $input.attr( 'aria-activedescendant', 'mce-wp-autocomplete-' + ui.item.ID );
- /*
- * Don't empty the URL input field, when using the arrow keys to
- * highlight items. See api.jqueryui.com/autocomplete/#event-focus
- */
- event.preventDefault();
- },
- select: function( event, ui ) {
- $input.val( ui.item.permalink );
-
- if ( inputs.wrap.hasClass( 'has-text-field' ) && $.trim( inputs.text.val() ) === '' ) {
- inputs.text.val( ui.item.title );
- }
-
- // Audible confirmation message when a link has been selected.
- wp.a11y.speak( wpLinkL10n.linkSelected );
-
- return false;
- },
- open: function() {
- $input.attr( 'aria-expanded', 'true' );
- },
- close: function() {
- $input.attr( 'aria-expanded', 'false' );
- },
- minLength: 2,
- position: {
- my: 'left top+2'
- },
- messages: {
- noResults: ( typeof window.uiAutocompleteL10n !== 'undefined' ) ? window.uiAutocompleteL10n.noResults : '',
- results: function( number ) {
- if ( typeof window.uiAutocompleteL10n !== 'undefined' ) {
- if ( number > 1 ) {
- return window.uiAutocompleteL10n.manyResults.replace( '%d', number );
- }
-
- return window.uiAutocompleteL10n.oneResult;
- }
- }
- }
- } ).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() {
- var inputValue = $input.val();
- /*
- * Don't trigger a search if the URL field already has a link or is empty.
- * Also, avoids screen readers announce `No search results`.
- */
- if ( inputValue && ! /^https?:/.test( inputValue ) ) {
- $input.autocomplete( 'search' );
- }
- } )
- .autocomplete( 'widget' )
- .addClass( 'wplink-autocomplete' )
- .attr( 'role', 'listbox' )
- .removeAttr( 'tabindex' ); // Remove the `tabindex=0` attribute added by jQuery UI.
+ inputs.url.on( 'blur', wpLink.correctURL );
},
// If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://
@@ -208,6 +149,10 @@
refresh: function( url, text ) {
var linkText = '';
+ // Refresh rivers (clear links, check visibility)
+ rivers.search.refresh();
+ rivers.recent.refresh();
+
if ( wpLink.isMCE() ) {
wpLink.mceRefresh( url, text );
} else {
@@ -237,10 +182,16 @@
// If this is moved above the selection changes,
// IE will show a flashing cursor over the dialog.
window.setTimeout( function() {
- inputs.url.focus()[0].select();
+ inputs.url[0].select();
+ inputs.url.focus();
} );
}
+ // 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:\/\//, '' );
},
@@ -271,27 +222,38 @@
return true;
},
- mceRefresh: function( url, text ) {
- var linkText,
+ mceRefresh: function( searchStr, text ) {
+ var linkText, href,
linkNode = getLink(),
onlyText = this.hasSelectedText( linkNode );
if ( linkNode ) {
linkText = linkNode.innerText || linkNode.textContent;
+ href = editor.dom.getAttrib( linkNode, 'href' );
if ( ! $.trim( linkText ) ) {
linkText = text || '';
}
- url = url || editor.dom.getAttrib( linkNode, 'href' );
+ if ( searchStr && ( urlRegexp.test( searchStr ) || emailRegexp.test( searchStr ) ) ) {
+ href = searchStr;
+ }
- if ( url !== '_wp_link_placeholder' ) {
- inputs.url.val( url );
+ if ( href !== '_wp_link_placeholder' ) {
+ inputs.url.val( href );
inputs.openInNewTab.prop( 'checked', '_blank' === editor.dom.getAttrib( linkNode, 'target' ) );
inputs.submit.val( wpLinkL10n.update );
} else {
this.setDefaultValues( linkText );
}
+
+ if ( searchStr && searchStr !== href ) {
+ // The user has typed something in the inline dialog. Trigger a search with it.
+ inputs.search.val( searchStr );
+ window.setTimeout( function() {
+ wpLink.searchInternalLinks();
+ } );
+ }
} else {
linkText = editor.selection.getContent({ format: 'text' }) || text || '';
this.setDefaultValues( linkText );
@@ -424,8 +386,6 @@
var attrs = wpLink.getAttrs(),
link, text;
- editor.focus();
-
if ( window.tinymce.isIE && editor.windowManager.wplinkBookmark ) {
editor.selection.moveToBookmark( editor.windowManager.wplinkBookmark );
editor.windowManager.wplinkBookmark = null;
@@ -471,33 +431,11 @@
wp.a11y.speak( wpLinkL10n.linkInserted );
},
- keydown: function( event ) {
- var 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();
- }
- }
+ updateFields: function( e, li ) {
+ inputs.url.val( li.children( '.item-permalink' ).val() );
},
getUrlFromSelection: function( selection ) {
- var emailRegexp = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i,
- urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i;
-
if ( ! selection ) {
if ( this.isMCE() ) {
selection = editor.selection.getContent({ format: 'text' });
@@ -526,8 +464,296 @@
// Update save prompt.
inputs.submit.val( wpLinkL10n.save );
+ },
+
+ searchInternalLinks: function() {
+ var waiting,
+ search = inputs.search.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 = inputs.search.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;
+ };
}
};
+ 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( window.ajaxurl, query, function( r ) {
+ self.page++;
+ self.querying = false;
+ self.allLoaded = ! r;
+ callback( r, query );
+ }, 'json' );
+ }
+ });
+
$( document ).ready( wpLink.init );
})( jQuery, window.wpLinkL10n, window.wp );