--- a/wp/wp-includes/js/wplink.js Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/js/wplink.js Tue Jun 09 03:35:32 2015 +0200
@@ -1,7 +1,15 @@
+/* global ajaxurl, tinymce, wpLinkL10n, setUserSetting, wpActiveEditor */
var wpLink;
-(function($){
- var inputs = {}, rivers = {}, ed, River, Query;
+( function( $ ) {
+ var editor, searchTimer, River, Query, correctedURL,
+ inputs = {},
+ rivers = {},
+ isTouch = ( 'ontouchend' in document );
+
+ function getLink() {
+ return editor.dom.getParent( editor.selection.getNode(), 'a' );
+ }
wpLink = {
timeToTriggerRiver: 150,
@@ -11,170 +19,283 @@
lastSearch: '',
textarea: '',
- init : function() {
- inputs.dialog = $('#wp-link');
- inputs.submit = $('#wp-link-submit');
- // URL
- inputs.url = $('#url-field');
- inputs.nonce = $('#_ajax_linking_nonce');
- // Secondary options
- inputs.title = $('#link-title-field');
- // Advanced Options
- inputs.openInNewTab = $('#link-target-checkbox');
- inputs.search = $('#search-field');
+ init: function() {
+ inputs.wrap = $('#wp-link-wrap');
+ inputs.dialog = $( '#wp-link' );
+ inputs.backdrop = $( '#wp-link-backdrop' );
+ inputs.submit = $( '#wp-link-submit' );
+ inputs.close = $( '#wp-link-close' );
+
+ // 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 = $('.query-results', inputs.dialog);
+ rivers.search = new River( $( '#search-results' ) );
+ rivers.recent = new River( $( '#most-recent-results' ) );
+ rivers.elements = inputs.dialog.find( '.query-results' );
+
+ // 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(e){
- e.preventDefault();
+ inputs.submit.click( function( event ) {
+ event.preventDefault();
wpLink.update();
});
- $('#wp-link-cancel').click( function(e){
- e.preventDefault();
+ inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel a' ).click( function( event ) {
+ event.preventDefault();
wpLink.close();
});
- $('#internal-toggle').click( wpLink.toggleInternalLinking );
+
+ $( '#wp-link-search-toggle' ).on( 'click', wpLink.toggleInternalLinking );
+
+ rivers.elements.on( 'river-select', wpLink.updateFields );
- rivers.elements.bind('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.keyup( function() {
+ var self = this;
- inputs.search.keyup( wpLink.searchInternalLinks );
+ window.clearTimeout( searchTimer );
+ searchTimer = window.setTimeout( function() {
+ wpLink.searchInternalLinks.call( self );
+ }, 500 );
+ });
+
+ function correctURL() {
+ var url = $.trim( inputs.url.val() );
- inputs.dialog.bind('wpdialogrefresh', wpLink.refresh);
- inputs.dialog.bind('wpdialogbeforeopen', wpLink.beforeOpen);
- inputs.dialog.bind('wpdialogclose', wpLink.onClose);
+ if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
+ inputs.url.val( 'http://' + url );
+ correctedURL = url;
+ }
+ }
+
+ inputs.url.on( 'paste', function() {
+ setTimeout( correctURL, 0 );
+ } );
+
+ inputs.url.on( 'blur', correctURL );
},
- beforeOpen : function() {
+ open: function( editorId ) {
+ var ed;
+
+ $( document.body ).addClass( 'modal-open' );
+
wpLink.range = null;
+ if ( editorId ) {
+ window.wpActiveEditor = editorId;
+ }
+
+ if ( ! window.wpActiveEditor ) {
+ return;
+ }
+
+ this.textarea = $( '#' + window.wpActiveEditor ).get( 0 );
+
+ if ( typeof tinymce !== 'undefined' ) {
+ ed = tinymce.get( wpActiveEditor );
+
+ if ( ed && ! ed.isHidden() ) {
+ editor = ed;
+ } else {
+ editor = null;
+ }
+
+ if ( editor && tinymce.isIE ) {
+ editor.windowManager.bookmark = editor.selection.getBookmark();
+ }
+ }
+
if ( ! wpLink.isMCE() && document.selection ) {
- wpLink.textarea.focus();
- wpLink.range = document.selection.createRange();
+ this.textarea.focus();
+ this.range = document.selection.createRange();
}
+
+ inputs.wrap.show();
+ inputs.backdrop.show();
+
+ wpLink.refresh();
+
+ $( document ).trigger( 'wplink-open', inputs.wrap );
},
- open : function() {
- if ( !wpActiveEditor )
- return;
-
- this.textarea = $('#'+wpActiveEditor).get(0);
-
- // Initialize the dialog if necessary (html mode).
- if ( ! inputs.dialog.data('wpdialog') ) {
- inputs.dialog.wpdialog({
- title: wpLinkL10n.title,
- width: 480,
- height: 'auto',
- modal: true,
- dialogClass: 'wp-dialog'
- });
- }
-
- inputs.dialog.wpdialog('open');
+ isMCE: function() {
+ return editor && ! editor.isHidden();
},
- isMCE : function() {
- return tinyMCEPopup && ( ed = tinyMCEPopup.editor ) && ! ed.isHidden();
- },
+ refresh: function() {
+ var text = '';
- refresh : function() {
// Refresh rivers (clear links, check visibility)
rivers.search.refresh();
rivers.recent.refresh();
- if ( wpLink.isMCE() )
+ if ( wpLink.isMCE() ) {
wpLink.mceRefresh();
- else
- wpLink.setDefaultValues();
+ } else {
+ // For the Text editor the "Link text" field is always shown
+ if ( ! inputs.wrap.hasClass( 'has-text-field' ) ) {
+ inputs.wrap.addClass( 'has-text-field' );
+ }
+
+ if ( document.selection ) {
+ // Old IE
+ text = document.selection.createRange().text || '';
+ } else if ( typeof this.textarea.selectionStart !== 'undefined' &&
+ ( this.textarea.selectionStart !== this.textarea.selectionEnd ) ) {
+ // W3C
+ text = this.textarea.value.substring( this.textarea.selectionStart, this.textarea.selectionEnd ) || '';
+ }
- // Focus the URL field and highlight its contents.
- // If this is moved above the selection changes,
- // IE will show a flashing cursor over the dialog.
- inputs.url.focus()[0].select();
+ inputs.text.val( text );
+ wpLink.setDefaultValues();
+ }
+
+ if ( isTouch ) {
+ // Close the onscreen keyboard
+ inputs.url.focus().blur();
+ } else {
+ // Focus the URL field and highlight its contents.
+ // If this is moved above the selection changes,
+ // IE will show a flashing cursor over the dialog.
+ 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 )
+ if ( ! rivers.recent.ul.children().length ) {
rivers.recent.ajax();
+ }
+
+ correctedURL = inputs.url.val().replace( /^http:\/\//, '' );
},
- mceRefresh : function() {
- var e;
- ed = tinyMCEPopup.editor;
+ hasSelectedText: function( linkNode ) {
+ var html = editor.selection.getContent();
+
+ // Partial html and not a fully selected anchor element
+ if ( /</.test( html ) && ( ! /^<a [^>]+>[^<]+<\/a>$/.test( html ) || html.indexOf('href=') === -1 ) ) {
+ return false;
+ }
+
+ if ( linkNode ) {
+ var nodes = linkNode.childNodes, i;
- tinyMCEPopup.restoreSelection();
+ if ( nodes.length === 0 ) {
+ return false;
+ }
+
+ for ( i = nodes.length - 1; i >= 0; i-- ) {
+ if ( nodes[i].nodeType != 3 ) {
+ return false;
+ }
+ }
+ }
- // If link exists, select proper values.
- if ( e = ed.dom.getParent(ed.selection.getNode(), 'A') ) {
- // Set URL and description.
- inputs.url.val( ed.dom.getAttrib(e, 'href') );
- inputs.title.val( ed.dom.getAttrib(e, 'title') );
- // Set open in new tab.
- inputs.openInNewTab.prop('checked', ( "_blank" == ed.dom.getAttrib( e, 'target' ) ) );
- // Update save prompt.
+ return true;
+ },
+
+ mceRefresh: function() {
+ var text,
+ selectedNode = editor.selection.getNode(),
+ linkNode = editor.dom.getParent( selectedNode, 'a[href]' ),
+ onlyText = this.hasSelectedText( linkNode );
+
+ if ( linkNode ) {
+ text = linkNode.innerText || linkNode.textContent;
+ inputs.url.val( editor.dom.getAttrib( linkNode, 'href' ) );
+ inputs.openInNewTab.prop( 'checked', '_blank' === editor.dom.getAttrib( linkNode, 'target' ) );
inputs.submit.val( wpLinkL10n.update );
+ } else {
+ text = editor.selection.getContent({ format: 'text' });
+ this.setDefaultValues();
+ }
- // If there's no link, set the default values.
+ if ( onlyText ) {
+ inputs.text.val( text || '' );
+ inputs.wrap.addClass( 'has-text-field' );
} else {
- wpLink.setDefaultValues();
+ inputs.text.val( '' );
+ inputs.wrap.removeClass( 'has-text-field' );
}
},
- close : function() {
- if ( wpLink.isMCE() )
- tinyMCEPopup.close();
- else
- inputs.dialog.wpdialog('close');
- },
+ close: function() {
+ $( document.body ).removeClass( 'modal-open' );
- onClose: function() {
if ( ! wpLink.isMCE() ) {
wpLink.textarea.focus();
+
if ( wpLink.range ) {
wpLink.range.moveToBookmark( wpLink.range.getBookmark() );
wpLink.range.select();
}
+ } else {
+ editor.focus();
}
+
+ inputs.backdrop.hide();
+ inputs.wrap.hide();
+
+ correctedURL = false;
+
+ $( document ).trigger( 'wplink-close', inputs.wrap );
},
- getAttrs : function() {
+ getAttrs: function() {
return {
- href : inputs.url.val(),
- title : inputs.title.val(),
- target : inputs.openInNewTab.prop('checked') ? '_blank' : ''
+ href: $.trim( inputs.url.val() ),
+ target: inputs.openInNewTab.prop( 'checked' ) ? '_blank' : ''
};
},
- update : function() {
- if ( wpLink.isMCE() )
+ update: function() {
+ if ( wpLink.isMCE() ) {
wpLink.mceUpdate();
- else
+ } else {
wpLink.htmlUpdate();
+ }
},
- htmlUpdate : function() {
- var attrs, html, begin, end, cursor,
+ htmlUpdate: function() {
+ var attrs, text, html, begin, end, cursor, selection,
textarea = wpLink.textarea;
- if ( ! textarea )
+ if ( ! textarea ) {
return;
+ }
attrs = wpLink.getAttrs();
+ text = inputs.text.val();
// If there's no href, return.
- if ( ! attrs.href || attrs.href == 'http://' )
+ if ( ! attrs.href ) {
return;
+ }
// Build HTML
html = '<a href="' + attrs.href + '"';
- if ( attrs.title )
- html += ' title="' + attrs.title + '"';
- if ( attrs.target )
+ if ( attrs.target ) {
html += ' target="' + attrs.target + '"';
+ }
html += '>';
@@ -184,26 +305,29 @@
// Note: If no text is selected, IE will not place the cursor
// inside the closing tag.
textarea.focus();
- wpLink.range.text = html + wpLink.range.text + '</a>';
+ wpLink.range.text = html + ( text || wpLink.range.text ) + '</a>';
wpLink.range.moveToBookmark( wpLink.range.getBookmark() );
wpLink.range.select();
wpLink.range = null;
} else if ( typeof textarea.selectionStart !== 'undefined' ) {
// W3C
- begin = textarea.selectionStart;
- end = textarea.selectionEnd;
- selection = textarea.value.substring( begin, end );
- html = html + selection + '</a>';
- cursor = begin + html.length;
+ begin = textarea.selectionStart;
+ end = textarea.selectionEnd;
+ selection = text || textarea.value.substring( begin, end );
+ html = html + selection + '</a>';
+ cursor = begin + html.length;
- // If no next is selected, place the cursor inside the closing tag.
- if ( begin == end )
- cursor -= '</a>'.length;
+ // If no text is selected, place the cursor inside the closing tag.
+ if ( begin === end && ! selection ) {
+ cursor -= 4;
+ }
- textarea.value = textarea.value.substring( 0, begin )
- + html
- + textarea.value.substring( end, textarea.value.length );
+ textarea.value = (
+ textarea.value.substring( 0, begin ) +
+ html +
+ textarea.value.substring( end, textarea.value.length )
+ );
// Update cursor position
textarea.selectionStart = textarea.selectionEnd = cursor;
@@ -213,78 +337,78 @@
textarea.focus();
},
- mceUpdate : function() {
- var ed = tinyMCEPopup.editor,
- attrs = wpLink.getAttrs(),
- e, b;
+ mceUpdate: function() {
+ var attrs = wpLink.getAttrs(),
+ link, text;
- tinyMCEPopup.restoreSelection();
- e = ed.dom.getParent(ed.selection.getNode(), 'A');
+ wpLink.close();
+ editor.focus();
- // If the values are empty, unlink and return
- if ( ! attrs.href || attrs.href == 'http://' ) {
- if ( e ) {
- b = ed.selection.getBookmark();
- ed.dom.remove(e, 1);
- ed.selection.moveToBookmark(b);
- tinyMCEPopup.execCommand("mceEndUndoLevel");
- wpLink.close();
- }
+ if ( tinymce.isIE ) {
+ editor.selection.moveToBookmark( editor.windowManager.bookmark );
+ }
+
+ if ( ! attrs.href ) {
+ editor.execCommand( 'unlink' );
return;
}
- if (e == null) {
- ed.getDoc().execCommand("unlink", false, null);
- tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
+ link = getLink();
+ text = inputs.text.val();
- tinymce.each(ed.dom.select("a"), function(n) {
- if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
- e = n;
- ed.dom.setAttribs(e, attrs);
+ if ( link ) {
+ if ( text ) {
+ if ( 'innerText' in link ) {
+ link.innerText = text;
+ } else {
+ link.textContent = text;
}
- });
+ }
+
+ editor.dom.setAttribs( link, attrs );
+ } else {
+ if ( text ) {
+ editor.selection.setNode( editor.dom.create( 'a', attrs, text ) );
+ } else {
+ editor.execCommand( 'mceInsertLink', false, attrs );
+ }
+ }
+ },
- // Sometimes WebKit lets a user create a link where
- // they shouldn't be able to. In this case, CreateLink
- // injects "#mce_temp_url#" into their content. Fix it.
- if ( tinymce.isWebKit && $(e).text() == '#mce_temp_url#' ) {
- ed.dom.remove(e);
- e = null;
- }
- } else {
- ed.dom.setAttribs(e, attrs);
+ 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,
+ urlRegexp = /^(https?|ftp):\/\/[A-Z0-9.-]+\.[A-Z]{2,4}[^ "]*$/i;
+
+ if ( this.isMCE() ) {
+ selection = editor.selection.getContent();
+ } else if ( document.selection && wpLink.range ) {
+ selection = wpLink.range.text;
+ } else if ( typeof this.textarea.selectionStart !== 'undefined' ) {
+ selection = this.textarea.value.substring( this.textarea.selectionStart, this.textarea.selectionEnd );
}
- // Move the caret if selection was not an image.
- if ( e && (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') ) {
- ed.selection.select(e);
- ed.selection.collapse(0);
- tinyMCEPopup.storeSelection();
+ if ( selection && emailRegexp.test( selection ) ) {
+ // Selection is email address
+ inputs.url.val( 'mailto:' + selection );
+ } else if ( selection && urlRegexp.test( selection ) ) {
+ // Selection is URL
+ inputs.url.val( selection.replace( /&|�?38;/gi, '&' ) );
+ } else {
+ // Set URL to default.
+ inputs.url.val( '' );
}
- ed.execCommand("mceEndUndoLevel");
- wpLink.close();
- ed.focus();
- },
-
- updateFields : function( e, li, originalEvent ) {
- inputs.url.val( li.children('.item-permalink').val() );
- inputs.title.val( li.hasClass('no-title') ? '' : li.children('.item-title').text() );
- if ( originalEvent && originalEvent.type == "click" )
- inputs.url.focus();
- },
- setDefaultValues : function() {
- // Set URL and description to defaults.
- // Leave the new tab setting as-is.
- inputs.url.val('http://');
- inputs.title.val('');
-
// Update save prompt.
inputs.submit.val( wpLinkL10n.save );
},
- searchInternalLinks : function() {
- var t = $(this), waiting,
+ searchInternalLinks: function() {
+ var t = $( this ), waiting,
search = t.val();
if ( search.length > 2 ) {
@@ -296,64 +420,75 @@
return;
wpLink.lastSearch = search;
- waiting = t.parent().find('.spinner').show();
+ waiting = t.parent().find( '.spinner' ).addClass( 'is-active' );
rivers.search.change( search );
- rivers.search.ajax( function(){ waiting.hide(); });
+ rivers.search.ajax( function() {
+ waiting.removeClass( 'is-active' );
+ });
} else {
rivers.search.hide();
rivers.recent.show();
}
},
- next : function() {
+ next: function() {
rivers.search.next();
rivers.recent.next();
},
- prev : function() {
+
+ prev: function() {
rivers.search.prev();
rivers.recent.prev();
},
- keydown : function( event ) {
- var fn, key = $.ui.keyCode;
+ keydown: function( event ) {
+ var fn, id,
+ key = $.ui.keyCode;
+
+ if ( key.ESCAPE === event.keyCode ) {
+ wpLink.close();
+ event.stopImmediatePropagation();
+ } else if ( key.TAB === event.keyCode ) {
+ id = event.target.id;
- 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;
+ // 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();
+ }
}
+
+ if ( event.keyCode !== key.UP && event.keyCode !== key.DOWN ) {
+ return;
+ }
+
+ if ( document.activeElement &&
+ ( document.activeElement.id === 'link-title-field' || document.activeElement.id === 'url-field' ) ) {
+ return;
+ }
+
+ fn = event.keyCode === key.UP ? 'prev' : 'next';
+ clearInterval( wpLink.keyInterval );
+ wpLink[ fn ]();
+ wpLink.keyInterval = setInterval( wpLink[ fn ], wpLink.keySensitivity );
event.preventDefault();
},
+
keyup: function( event ) {
var key = $.ui.keyCode;
- switch( event.which ) {
- case key.ESCAPE:
- event.stopImmediatePropagation();
- if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [{ event: event, what: 'wplink', cb: wpLink.close }] ) )
- wpLink.close();
-
- return false;
- break;
- case key.UP:
- case key.DOWN:
- clearInterval( wpLink.keyInterval );
- break;
- default:
- return;
+ if ( event.which === key.UP || event.which === key.DOWN ) {
+ clearInterval( wpLink.keyInterval );
+ event.preventDefault();
}
- event.preventDefault();
},
- delayedCallback : function( func, delay ) {
+ delayedCallback: function( func, delay ) {
var timeoutTriggered, funcTriggered, funcArgs, funcContext;
if ( ! delay )
@@ -364,7 +499,7 @@
return func.apply( funcContext, funcArgs );
// Otherwise, wait.
timeoutTriggered = true;
- }, delay);
+ }, delay );
return function() {
if ( timeoutTriggered )
@@ -376,53 +511,38 @@
};
},
- toggleInternalLinking : function( event ) {
- var panel = $('#search-panel'),
- widget = inputs.dialog.wpdialog('widget'),
- // We're about to toggle visibility; it's currently the opposite
- visible = !panel.is(':visible'),
- win = $(window);
-
- $(this).toggleClass('toggle-arrow-active', visible);
+ toggleInternalLinking: function( event ) {
+ var visible = inputs.wrap.hasClass( 'search-panel-visible' );
- inputs.dialog.height('auto');
- panel.slideToggle( 300, function() {
- setUserSetting('wplink', visible ? '1' : '0');
- inputs[ visible ? 'search' : 'url' ].focus();
-
- // Move the box if the box is now expanded, was opened in a collapsed state,
- // and if it needs to be moved. (Judged by bottom not being positive or
- // bottom being smaller than top.)
- var scroll = win.scrollTop(),
- top = widget.offset().top,
- bottom = top + widget.outerHeight(),
- diff = bottom - win.height();
-
- if ( diff > scroll ) {
- widget.animate({'top': diff < top ? top - diff : scroll }, 200);
- }
- });
+ 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.ul = element.children( 'ul' );
+ this.contentHeight = element.children( '#link-selector-height' );
this.waiting = element.find('.river-waiting');
this.change( search );
this.refresh();
- element.scroll( function(){ self.maybeLoad(); });
- element.delegate('li', 'click', function(e){ self.select( $(this), e ); });
+ $( '#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');
+ this.visible = this.element.is( ':visible' );
},
show: function() {
if ( ! this.visible ) {
@@ -439,11 +559,11 @@
select: function( li, event ) {
var liHeight, elHeight, liTop, elTop;
- if ( li.hasClass('unselectable') || li == this.selected )
+ if ( li.hasClass( 'unselectable' ) || li == this.selected )
return;
this.deselect();
- this.selected = li.addClass('selected');
+ this.selected = li.addClass( 'selected' );
// Make sure the element is visible
liHeight = li.outerHeight();
elHeight = this.element.height();
@@ -456,11 +576,11 @@
this.element.scrollTop( elTop + liTop - elHeight + liHeight );
// Trigger the river-select event
- this.element.trigger('river-select', [ li, event, this ]);
+ this.element.trigger( 'river-select', [ li, event, this ] );
},
deselect: function() {
if ( this.selected )
- this.selected.removeClass('selected');
+ this.selected.removeClass( 'selected' );
this.selected = false;
},
prev: function() {
@@ -469,7 +589,7 @@
var to;
if ( this.selected ) {
- to = this.selected.prev('li');
+ to = this.selected.prev( 'li' );
if ( to.length )
this.select( to );
}
@@ -478,7 +598,7 @@
if ( ! this.visible )
return;
- var to = this.selected ? this.selected.next('li') : $('li:not(.unselectable):first', this.element);
+ var to = this.selected ? this.selected.next( 'li' ) : $( 'li:not(.unselectable):first', this.element );
if ( to.length )
this.select( to );
},
@@ -499,27 +619,26 @@
this._search = search;
this.query = new Query( search );
- this.element.scrollTop(0);
+ this.element.scrollTop( 0 );
},
process: function( results, params ) {
var list = '', alt = true, classes = '',
firstPage = params.page == 1;
- if ( !results ) {
+ if ( ! results ) {
if ( firstPage ) {
- list += '<li class="unselectable"><span class="item-title"><em>'
- + wpLinkL10n.noMatchesFound
- + '</em></span></li>';
+ list += '<li class="unselectable no-matches-found"><span class="item-title"><em>' +
+ wpLinkL10n.noMatchesFound + '</em></span></li>';
}
} else {
$.each( results, function() {
classes = alt ? 'alternate' : '';
- classes += this['title'] ? '' : ' no-title';
+ classes += this.title ? '' : ' no-title';
list += classes ? '<li class="' + classes + '">' : '<li>';
- list += '<input type="hidden" class="item-permalink" value="' + this['permalink'] + '" />';
+ list += '<input type="hidden" class="item-permalink" value="' + this.permalink + '" />';
list += '<span class="item-title">';
- list += this['title'] ? this['title'] : wpLinkL10n.noTitle;
- list += '</span><span class="item-info">' + this['info'] + '</span></li>';
+ list += this.title ? this.title : wpLinkL10n.noTitle;
+ list += '</span><span class="item-info">' + this.info + '</span></li>';
alt = ! alt;
});
}
@@ -531,20 +650,22 @@
el = this.element,
bottom = el.scrollTop() + el.height();
- if ( ! this.query.ready() || bottom < this.ul.height() - wpLink.riverBottomThreshold )
+ 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.ul.height() - wpLink.riverBottomThreshold )
+ if ( ! self.query.ready() || newBottom < self.contentHeight.height() - wpLink.riverBottomThreshold )
return;
- self.waiting.show();
+ self.waiting.addClass( 'is-active' );
el.scrollTop( newTop + self.waiting.outerHeight() );
- self.ajax( function() { self.waiting.hide(); });
+ self.ajax( function() {
+ self.waiting.removeClass( 'is-active' );
+ });
}, wpLink.timeToTriggerRiver );
}
});
@@ -558,7 +679,7 @@
$.extend( Query.prototype, {
ready: function() {
- return !( this.querying || this.allLoaded );
+ return ! ( this.querying || this.allLoaded );
},
ajax: function( callback ) {
var self = this,
@@ -573,14 +694,14 @@
this.querying = true;
- $.post( ajaxurl, query, function(r) {
+ $.post( ajaxurl, query, function( r ) {
self.page++;
self.querying = false;
- self.allLoaded = !r;
+ self.allLoaded = ! r;
callback( r, query );
- }, "json" );
+ }, 'json' );
}
});
- $(document).ready( wpLink.init );
-})(jQuery);
+ $( document ).ready( wpLink.init );
+})( jQuery );