enmi-conf.org: comparison wp/wp-includes/js/wplink.js

Mercurial Mercurial > enmi-conf.org / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

wp/wp-includes/js/wplink.js

changeset 18	be944660c56a
parent 16	a86126ab1dd4
child 21	48c4eec2b7e6

equal deleted inserted replaced

-:34716fd837a4
+:be944660c56a
 			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.on( 'keydown', wpLink.keydown );
-			inputs.dialog.keyup( wpLink.keyup );
+			inputs.dialog.on( 'keyup', wpLink.keyup );
-			inputs.submit.click( function( event ) {
+			inputs.submit.on( 'click', function( event ) {
 				event.preventDefault();
 				wpLink.update();
 			});
-			inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel button' ).click( function( event ) {
+			inputs.close.add( inputs.backdrop ).add( '#wp-link-cancel button' ).on( 'click', function( event ) {
 				event.preventDefault();
 				wpLink.close();
 			});
 			rivers.elements.on( 'river-select', wpLink.updateFields );
 			inputs.url.on( 'blur', wpLink.correctURL );
 		},
 		// If URL wasn't corrected last time and doesn't start with http:, https:, ? # or /, prepend http://.
 		correctURL: function () {
-			var url = $.trim( inputs.url.val() );
+			var url = inputs.url.val().trim();
 			if ( url && correctedURL !== url && ! /^(?:[a-z]+:|#|\?|\.|\/)/.test( url ) ) {
 				inputs.url.val( 'http://' + url );
 				correctedURL = url;
 			}
 				wpLink.setDefaultValues();
 			}
 			if ( isTouch ) {
 				// Close the onscreen keyboard.
-				inputs.url.focus().blur();
+				inputs.url.trigger( 'focus' ).trigger( '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.
 				 */
 				window.setTimeout( function() {
 					inputs.url[0].select();
-					inputs.url.focus();
+					inputs.url.trigger( 'focus' );
 				} );
 			}
 			// Load the most recent results if this is the first time opening the panel.
 			if ( ! rivers.recent.ul.children().length ) {
 			if ( linkNode.length ) {
 				linkText = linkNode.text();
 				href = linkNode.attr( 'href' );
-				if ( ! $.trim( linkText ) ) {
+				if ( ! linkText.trim() ) {
 					linkText = text || '';
 				}
 				if ( searchStr && ( urlRegexp.test( searchStr ) || emailRegexp.test( searchStr ) ) ) {
 					href = searchStr;
 		getAttrs: function() {
 			wpLink.correctURL();
 			return {
-				href: $.trim( inputs.url.val() ),
+				href: inputs.url.val().trim(),
 				target: inputs.openInNewTab.prop( 'checked' ) ? '_blank' : null
 			};
 		},
 		buildHtml: function(attrs) {
 			editor.undoManager.transact( function() {
 				if ( ! $link.length ) {
 					editor.execCommand( 'mceInsertLink', false, { href: '_wp_link_placeholder', 'data-wp-temp-link': 1 } );
 					$link = editor.$( 'a[data-wp-temp-link="1"]' ).removeAttr( 'data-wp-temp-link' );
-					hasText = $.trim( $link.text() );
+					hasText = $link.text().trim();
 				}
 				if ( ! $link.length ) {
 					editor.execCommand( 'unlink' );
 				} else {
 				} else if ( typeof this.textarea.selectionStart !== 'undefined' ) {
 					selection = this.textarea.value.substring( this.textarea.selectionStart, this.textarea.selectionEnd );
 				}
 			}
-			selection = $.trim( selection );
+			selection = selection || '';
+			selection = selection.trim();
 			if ( selection && emailRegexp.test( selection ) ) {
 				// Selection is email address.
 				return 'mailto:' + selection;
 			} else if ( selection && urlRegexp.test( selection ) ) {
 				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();
+					inputs.close.trigger( 'focus' );
 					event.preventDefault();
 				} else if ( id === 'wp-link-close' && event.shiftKey ) {
-					inputs.submit.focus();
+					inputs.submit.trigger( 'focus' );
 					event.preventDefault();
 				}
 			}
 			// Up Arrow and Down Arrow keys.
 		this.waiting = element.find('.river-waiting');
 		this.change( search );
 		this.refresh();
-		$( '#wp-link .query-results, #wp-link #link-selector' ).scroll( function() {
+		$( '#wp-link .query-results, #wp-link #link-selector' ).on( 'scroll', function() {
 			self.maybeLoad();
 		});
 		element.on( 'click', 'li', function( event ) {
 			self.select( $( this ), event );
 		});
 				callback( r, query );
 			}, 'json' );
 		}
 	});
-	$( document ).ready( wpLink.init );
+	$( wpLink.init );
 })( jQuery, window.wpLinkL10n, window.wp );

enmi-conf.org