Ticket #25914: 25914.diff

src/wp-includes/js/wplink.js

@@ +1 @@
+/* global ajaxurl, tinymce, wpLinkL10n, tinyMCEPopup, setUserSetting, wpActiveEditor */
 var wpLink;
 
 (function($){
@@ -113 +114 @@
                                 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' ) ) );
+                                inputs.openInNewTab.prop('checked', ( '_blank' == ed.dom.getAttrib( e, 'target' ) ) );
                                 // Update save prompt.
                                 inputs.submit.val( wpLinkL10n.update );
 
@@ -156 +157 @@
                 },
 
                 htmlUpdate : function() {
-                        var attrs, html, begin, end, cursor,
+                        var attrs, html, begin, end, cursor, selection,
                                 textarea = wpLink.textarea;
 
                         if ( ! textarea )
@@ -201 +202 @@
                                 if ( begin == end )
                                         cursor -= '</a>'.length;
 
-                                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;
@@ -227 +228 @@
                                         b = ed.selection.getBookmark();
                                         ed.dom.remove(e, 1);
                                         ed.selection.moveToBookmark(b);
-                                        tinyMCEPopup.execCommand("mceEndUndoLevel");
+                                        tinyMCEPopup.execCommand('mceEndUndoLevel');
                                         wpLink.close();
                                 }
                                 return;
                         }
 
                         if (e == null) {
-                                ed.getDoc().execCommand("unlink", false, null);
-                                tinyMCEPopup.execCommand("mceInsertLink", false, "#mce_temp_url#", {skip_undo : 1});
+                                ed.getDoc().execCommand('unlink', false, null);
+                                tinyMCEPopup.execCommand('mceInsertLink', false, '#mce_temp_url#', {skip_undo : 1});
 
-                                tinymce.each(ed.dom.select("a"), function(n) {
+                                tinymce.each(ed.dom.select('a'), function(n) {
                                         if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
                                                 e = n;
                                                 ed.dom.setAttribs(e, attrs);
@@ -262 +263 @@
                                 tinyMCEPopup.storeSelection();
                         }
 
-                        ed.execCommand("mceEndUndoLevel");
+                        ed.execCommand('mceEndUndoLevel');
                         wpLink.close();
                         ed.focus();
                 },
@@ -270 +271 @@
                 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" )
+                        if ( originalEvent && originalEvent.type == 'click' )
                                 inputs.url.focus();
                 },
                 setDefaultValues : function() {
@@ -320 +321 @@
 
                         switch( event.which ) {
                                 case key.UP:
-                                        fn = 'prev';
                                 case key.DOWN:
-                                        fn = fn || 'next';
+                                        fn = key.UP ? 'prev' : 'next';
                                         clearInterval( wpLink.keyInterval );
                                         wpLink[ fn ]();
                                         wpLink.keyInterval = setInterval( wpLink[ fn ], wpLink.keySensitivity );
@@ -333 +333 @@
                         event.preventDefault();
                 },
                 keyup: function( event ) {
-                        var key = $.ui.keyCode;
+                        var key = $.ui.keyCode,
+                                returnStatus;
 
                         switch( event.which ) {
                                 case key.ESCAPE:
                                         event.stopImmediatePropagation();
                                         if ( ! $(document).triggerHandler( 'wp_CloseOnEscape', [{ event: event, what: 'wplink', cb: wpLink.close }] ) )
                                                 wpLink.close();
-
-                                        return false;
+                                        returnStatus = false;
                                         break;
                                 case key.UP:
                                 case key.DOWN:
@@ -350 +350 @@
                                 default:
                                         return;
                         }
+                        if (typeof(returnStatus) !== 'undefined')
+                                return returnStatus;
                         event.preventDefault();
                 },
 
@@ -507 +509 @@
 
                         if ( !results ) {
                                 if ( firstPage ) {
-                                        list += '<li class="unselectable"><span class="item-title"><em>'
-                                        + wpLinkL10n.noMatchesFound
-                                        + '</em></span></li>';
+                                        list += '<li class="unselectable"><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;
                                 });
                         }
@@ -578 +580 @@
                                 self.querying = false;
                                 self.allLoaded = !r;
                                 callback( r, query );
-                        }, "json" );
+                        }, 'json' );
                 }
         });