Wordpress 3.3

[autoinstalls/wordpress.git] / wp-admin / js / nav-menu.dev.js

diff --git a/wp-admin/js/nav-menu.dev.js b/wp-admin/js/nav-menu.dev.js
index 2df0a8d3549011a6ed2948b28c084431af619cc8..136683987790413cd5dfc4150c26c4400e93ada6 100644 (file)
--- a/wp-admin/js/nav-menu.dev.js
+++ b/wp-admin/js/nav-menu.dev.js
@@ -427,6 +427,12 @@ var wpNavMenu;
                                        }
                                }
                        });
+                       $('#add-custom-links input[type="text"]').keypress(function(e){
+                               if ( e.keyCode === 13 ) {
+                                       e.preventDefault();
+                                       $("#submit-customlinkdiv").click();
+                               }
+                       });
                },
 
                /**
@@ -461,7 +467,7 @@ var wpNavMenu;
                        var loc = $('#nav-menu-theme-locations'), params = {};
                        params['action'] = 'menu-locations-save';
                        params['menu-settings-column-nonce'] = $('#menu-settings-column-nonce').val();
-                       loc.find('input[type=submit]').click(function() {
+                       loc.find('input[type="submit"]').click(function() {
                                loc.find('select').each(function() {
                                        params[this.name] = $(this).val();
                                });
@@ -598,7 +604,7 @@ var wpNavMenu;
                                };
                        } else {
                                // Make the post boxes read-only, as they can't be used yet
-                               $('#menu-settings-column').find('input,select').attr('disabled', 'disabled').end().find('a').attr('href', '#').unbind('click');
+                               $('#menu-settings-column').find('input,select').prop('disabled', true).end().find('a').attr('href', '#').unbind('click');
                        }
                },
 
@@ -640,7 +646,7 @@ var wpNavMenu;
                                                if( items.length === items.filter(':checked').length )
                                                        items.removeAttr('checked');
                                                else
-                                                       items.attr('checked', 'checked');
+                                                       items.prop('checked', true);
                                                return false;
                                        }
                                } else if ( target.hasClass('submit-add-to-menu') ) {
@@ -890,22 +896,25 @@ var wpNavMenu;
                 * @param jQuery panel The tabs panel we're searching in.
                 */
                processQuickSearchQueryResponse : function(resp, req, panel) {
-                       var i, matched, newID,
+                       var matched, newID,
                        takenIDs = {},
                        form = document.getElementById('nav-menu-meta'),
                        pattern = new RegExp('menu-item\\[(\[^\\]\]*)', 'g'),
-                       items = resp.match(/<li>.*<\/li>/g);
+                       $items = $('<div>').html(resp).find('li'),
+                       $item;
 
-                       if( ! items ) {
+                       if( ! $items.length ) {
                                $('.categorychecklist', panel).html( '<li><p>' + navMenuL10n.noResultsFound + '</p></li>' );
                                $('img.waiting', panel).hide();
                                return;
                        }
 
-                       i = items.length;
-                       while( i-- ) {
+                       $items.each(function(){
+                               $item = $(this);
+
                                // make a unique DB ID number
-                               matched = pattern.exec(items[i]);
+                               matched = pattern.exec($item.html());
+
                                if ( matched && matched[1] ) {
                                        newID = matched[1];
                                        while( form.elements['menu-item[' + newID + '][menu-item-type]'] || takenIDs[ newID ] ) {
@@ -914,12 +923,15 @@ var wpNavMenu;
 
                                        takenIDs[newID] = true;
                                        if ( newID != matched[1] ) {
-                                               items[i] = items[i].replace(new RegExp('menu-item\\[' + matched[1] + '\\]', 'g'), 'menu-item[' + newID + ']');
+                                               $item.html( $item.html().replace(new RegExp(
+                                                       'menu-item\\[' + matched[1] + '\\]', 'g'),
+                                                       'menu-item[' + newID + ']'
+                                               ) );
                                        }
                                }
-                       }
+                       });
 
-                       $('.categorychecklist', panel).html( items.join('') );
+                       $('.categorychecklist', panel).html( $items );
                        $('img.waiting', panel).hide();
                },