From b6255705644fcb6b36d8957dece42a3b18170e39 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Mon, 16 Jan 2012 00:30:27 +0100
Subject: [PATCH 1/4] Minor coding style tweaks.

---
 admin_menu.css    |    9 ++++++---
 admin_menu.inc    |   22 ++++++++++++++++++++++
 admin_menu.js     |   30 ++++++++++++++++--------------
 admin_menu.module |   13 +------------
 4 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/admin_menu.css b/admin_menu.css
index f72e234..466687d 100644
--- a/admin_menu.css
+++ b/admin_menu.css
@@ -183,8 +183,8 @@ body.admin-menu {
 /* Search form */
 #admin-menu .admin-menu-search .form-item {
   margin: 0;
+  padding: 0;
 }
-
 #admin-menu .admin-menu-search input {
   background: #fff url('images/search.png') top right no-repeat;
   -webkit-border-radius: 5px;
@@ -201,14 +201,17 @@ body.admin-menu {
 #admin-menu .admin-menu-search-results {
   display: block !important;
 }
-
 #admin-menu .admin-menu-search-results,
 #admin-menu .admin-menu-search-results li {
   width: 186px
 }
 
+#admin-menu li.highlight {
+  background-color: #eee;
+}
 #admin-menu li.highlight > a {
-  color: #ff0000 !important;
+  border-color: #ccc;
+  color: #111 !important;
 }
 
 /* #210615: Mozilla on Mac fix */
diff --git a/admin_menu.inc b/admin_menu.inc
index 41b45d1..d406f2e 100644
--- a/admin_menu.inc
+++ b/admin_menu.inc
@@ -568,6 +568,28 @@ function admin_menu_links_user() {
 }
 
 /**
+ * Build search widget.
+ *
+ * @see theme_admin_menu_links()
+ */
+function admin_menu_links_search() {
+  $links = array(
+    '#type' => 'textfield',
+    '#title' => t('Search'),
+    '#title_display' => 'invisible',
+    '#attributes' => array(
+      'placeholder' => t('Search'),
+    ),
+    // Cannot use .admin-menu-action, as it applies a wonky/special right
+    // viewport alignment.
+    '#prefix' => '<li class="admin-menu-search">',
+    '#suffix' => '</li>',
+    '#weight' => 200,
+  );
+  return $links;
+}
+
+/**
  * Form builder function for module settings.
  */
 function admin_menu_theme_settings() {
diff --git a/admin_menu.js b/admin_menu.js
index c829104..7a70909 100644
--- a/admin_menu.js
+++ b/admin_menu.js
@@ -1,9 +1,11 @@
 (function($) {
 
-// Extend jQuery with a case-insensitive *:containsi selector.
+/**
+ * Extends jQuery with a case-insensitive *:containsi selector.
+ */
 $.extend($.expr[':'], {
-  'containsi': function(elem, i, match, array) {
-    return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
+  'containsi': function (elem, i, match, array) {
+    return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || '').toLowerCase()) >= 0;
   }
 });
 
@@ -215,40 +217,40 @@ Drupal.admin.behaviors.hover = function (context, settings, $adminMenu) {
 /**
  * Apply the search bar functionality.
  */
-Drupal.admin.behaviors.search = function(context, settings, $adminMenu) {
+Drupal.admin.behaviors.search = function (context, settings, $adminMenu) {
   // Add the container for the search results.
   $('.admin-menu-search input', $adminMenu).each(function () {
     // Append the results container.
     var $results = $('<ul class="admin-menu-search-results"/>').insertAfter($(this));
     // Initialize the current value property on the input element.
     $(this).data('current', $(this).val());
-    $(this).keyup(function (e) {
+    $(this).keyup(function (event) {
       // Only proceed if the string in the search box has changed.
-      if ($(this).data('current') != e.target.value) {
-        $(this).data('current', e.target.value);
+      if ($(this).data('current') != event.target.value) {
+        $(this).data('current', event.target.value);
         // Nuke all previous results from the results container.
         $results.empty();
         $('li', $adminMenu).removeClass('hover');
         $('li a', $adminMenu).removeClass('highlight');
         // Only search for matches if we have a search string that is at least
         // three characters long.
-        if (e.target.value.length >= 3) {
+        if (event.target.value.length >= 3) {
           // Select all links that match the search term and are not siblings
           // of the actions menu.
-          $('li:not(.admin-menu-action, .admin-menu-action li) > a:containsi("' + e.target.value + '")', $adminMenu).each(function () {
+          $('li:not(.admin-menu-action, .admin-menu-action li) > a:containsi("' + event.target.value + '")', $adminMenu).each(function () {
             var $match = $(this);
             var $parent = $match.parent();
             var $trail = $parent.parentsUntil('#admin-menu-wrapper', 'li');
-            var $text = $match.text();
+            var text = $match.text();
             // Check which category this menu item belongs to and add that
             // information to the result.
-            var $category = $parent.parents('#admin-menu-wrapper > ul > li:not(.admin-menu-icon)').children('a').text();
-            if ($category) {
-              $text = $text + ' (' + $category + ')';
+            var category = $parent.parents('#admin-menu-wrapper > ul > li:not(.admin-menu-icon)').children('a').text();
+            if (category) {
+              text = text + ' (' + category + ')';
             }
             // .toggleClass() might cause problems here since we got the delayed
             // blur behavior on in the rest of the navigation.
-            $('<li><a href="' + $match.attr('href') + '">' + $text +'</a></li>').appendTo($results).hover(function () {
+            $('<li><a href="' + $match.attr('href') + '">' + text +'</a></li>').appendTo($results).hover(function () {
               $parent.addClass('highlight');
               $trail.addClass('hover');
             }, function () {
diff --git a/admin_menu.module b/admin_menu.module
index a299b30..e37d54f 100644
--- a/admin_menu.module
+++ b/admin_menu.module
@@ -416,18 +416,7 @@ function admin_menu_output() {
     // Add menu additions.
     $content['icon'] = admin_menu_links_icon();
     $content['user'] = admin_menu_links_user();
-
-    $content['search'] = array(
-      '#type' => 'textfield',
-      '#title' => t('Search'),
-      '#title_display' => 'invisible',
-      '#attributes' => array(
-        'placeholder' => t('Search'),
-      ),
-      '#prefix' => '<li class="admin-menu-search">',
-      '#suffix' => '</li>',
-      '#weight' => 200,
-    );
+    $content['search'] = admin_menu_links_search();
 
     // Allow modules to alter the output.
     drupal_alter('admin_menu_output', $content);
-- 
1.7.6.msysgit.0


From 8016231c187677215fcd392839cd8272102bc191 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Mon, 16 Jan 2012 01:19:50 +0100
Subject: [PATCH 2/4] Various improvements for performance and less code.

---
 admin_menu.css |    4 ++--
 admin_menu.js  |   49 +++++++++++++++++++++++++------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/admin_menu.css b/admin_menu.css
index 466687d..cc3070d 100644
--- a/admin_menu.css
+++ b/admin_menu.css
@@ -207,10 +207,10 @@ body.admin-menu {
 }
 
 #admin-menu li.highlight {
-  background-color: #eee;
+  background-color: #eee !important;
 }
 #admin-menu li.highlight > a {
-  border-color: #ccc;
+  border-color: #ccc !important;
   color: #111 !important;
 }
 
diff --git a/admin_menu.js b/admin_menu.js
index 7a70909..a0ba250 100644
--- a/admin_menu.js
+++ b/admin_menu.js
@@ -218,44 +218,45 @@ Drupal.admin.behaviors.hover = function (context, settings, $adminMenu) {
  * Apply the search bar functionality.
  */
 Drupal.admin.behaviors.search = function (context, settings, $adminMenu) {
-  // Add the container for the search results.
   $('.admin-menu-search input', $adminMenu).each(function () {
+    var self = this, $self = $(this);
+
     // Append the results container.
-    var $results = $('<ul class="admin-menu-search-results"/>').insertAfter($(this));
-    // Initialize the current value property on the input element.
-    $(this).data('current', $(this).val());
-    $(this).keyup(function (event) {
-      // Only proceed if the string in the search box has changed.
-      if ($(this).data('current') != event.target.value) {
-        $(this).data('current', event.target.value);
-        // Nuke all previous results from the results container.
+    var $results = $('<ul class="admin-menu-search-results" />').insertAfter(self);
+
+    // Initialize the current search needle.
+    self.needle = $self.val();
+
+    $self.keyup(function (event) {
+      // Only proceed if the search needle has changed.
+      if (self.needle != event.target.value) {
+        // Update needle and remove previous results.
+        self.needle = event.target.value;
         $results.empty();
-        $('li', $adminMenu).removeClass('hover');
-        $('li a', $adminMenu).removeClass('highlight');
-        // Only search for matches if we have a search string that is at least
-        // three characters long.
+        $('li, li a', $adminMenu).removeClass('hover highlight');
+
+        // Only search if the needle is longer than 3 characters.
         if (event.target.value.length >= 3) {
           // Select all links that match the search term and are not siblings
           // of the actions menu.
-          $('li:not(.admin-menu-action, .admin-menu-action li) > a:containsi("' + event.target.value + '")', $adminMenu).each(function () {
+          // Separate selector and .filter() to leverage Sizzle cache.
+          $('li:not(.admin-menu-action, .admin-menu-action li) > a').filter(':containsi("' + event.target.value + '")', $adminMenu).each(function () {
             var $match = $(this);
             var $parent = $match.parent();
-            var $trail = $parent.parentsUntil('#admin-menu-wrapper', 'li');
-            var text = $match.text();
+            var result = $match.text();
             // Check which category this menu item belongs to and add that
             // information to the result.
-            var category = $parent.parents('#admin-menu-wrapper > ul > li:not(.admin-menu-icon)').children('a').text();
-            if (category) {
-              text = text + ' (' + category + ')';
+            var $category = $('#admin-menu-wrapper > ul > li').has(this);
+            if ($category) {
+              result = $category.children('a').text() + ': ' + result;
             }
-            // .toggleClass() might cause problems here since we got the delayed
-            // blur behavior on in the rest of the navigation.
-            $('<li><a href="' + $match.attr('href') + '">' + text +'</a></li>').appendTo($results).hover(function () {
+
+            $('<li><a href="' + $match.attr('href') + '">' + result +'</a></li>').appendTo($results).hover(function () {
               $parent.addClass('highlight');
-              $trail.addClass('hover');
+              $match.trigger('mouseenter');
             }, function () {
               $parent.removeClass('highlight');
-              $trail.removeClass('hover');
+              $match.trigger('mouseleave');
             });
           });
         }
-- 
1.7.6.msysgit.0


From 75fff8d465f82290cf8d9f970f7065fcb49103b2 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Mon, 16 Jan 2012 01:33:44 +0100
Subject: [PATCH 3/4] Fixed $category is always non-empty.

Actually, there's little point in checking $category in the first place, but that probably needs discussion.
---
 admin_menu.js |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin_menu.js b/admin_menu.js
index a0ba250..da850bc 100644
--- a/admin_menu.js
+++ b/admin_menu.js
@@ -244,10 +244,10 @@ Drupal.admin.behaviors.search = function (context, settings, $adminMenu) {
             var $match = $(this);
             var $parent = $match.parent();
             var result = $match.text();
-            // Check which category this menu item belongs to and add that
-            // information to the result.
+
+            // Add the top-level category to the result.
             var $category = $('#admin-menu-wrapper > ul > li').has(this);
-            if ($category) {
+            if ($category.length) {
               result = $category.children('a').text() + ': ' + result;
             }
 
-- 
1.7.6.msysgit.0


From 25323d9f444a4c5f977f77be67415f755e46efb0 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Mon, 16 Jan 2012 01:48:57 +0100
Subject: [PATCH 4/4] Reverted all unrelated changes.

---
 admin_menu.css |   38 +++++++++++++++++++++-----------------
 admin_menu.js  |   47 +++++++++++++++++++++++++++++++++++------------
 2 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/admin_menu.css b/admin_menu.css
index cc3070d..7119d74 100644
--- a/admin_menu.css
+++ b/admin_menu.css
@@ -107,6 +107,7 @@ body.admin-menu {
 #admin-menu li ul {
   background: none;
   display: none;
+  left: -999em;
   line-height: 1.2em;
   margin: 0;
   position: absolute;
@@ -115,18 +116,19 @@ body.admin-menu {
 
 /* Third-and-above-level lists */
 #admin-menu li li.expandable ul {
-  margin: -19px 0 0 160px;
+  margin: -20px 0 0 160px;
 }
 
 #admin-menu li:hover ul ul,
 #admin-menu li:hover ul ul ul,
 #admin-menu li:hover ul ul ul ul,
 #admin-menu li:hover ul ul ul ul ul,
-#admin-menu li.hover ul ul,
-#admin-menu li.hover ul ul ul,
-#admin-menu li.hover ul ul ul ul,
-#admin-menu li.hover ul ul ul ul ul {
+#admin-menu li.iehover ul ul,
+#admin-menu li.iehover ul ul ul,
+#admin-menu li.iehover ul ul ul ul,
+#admin-menu li.iehover ul ul ul ul ul {
   display: none;
+  left: -999em;
 }
 
 /* Lists nested under hovered list items */
@@ -135,12 +137,13 @@ body.admin-menu {
 #admin-menu li li li:hover ul,
 #admin-menu li li li li:hover ul,
 #admin-menu li li li li li:hover ul,
-#admin-menu li.hover ul,
-#admin-menu li li.hover ul,
-#admin-menu li li li.hover ul,
-#admin-menu li li li li.hover ul,
-#admin-menu li li li li li.hover ul {
+#admin-menu li.iehover ul,
+#admin-menu li li.iehover ul,
+#admin-menu li li li.iehover ul,
+#admin-menu li li li li.iehover ul,
+#admin-menu li li li li li.iehover ul {
   display: block;
+  left: auto;
 }
 #admin-menu li.admin-menu-action:hover ul {
   right: 0;
@@ -151,7 +154,7 @@ body.admin-menu {
   background: #45454A url(images/arrow.png) no-repeat 145px 6px;
 }
 #admin-menu li li:hover,
-#admin-menu li li.hover {
+#admin-menu li li.iehover {
   background-color: #111;
 }
 #admin-menu li li:hover a,
@@ -169,13 +172,13 @@ body.admin-menu {
   border-color: #323232;
 }
 #admin-menu li li:hover li a,
-#admin-menu li li.hover li a,
-#admin-menu li li.hover li.hover li a {
+#admin-menu li li.iehover li a,
+#admin-menu li li.iehover li.iehover li a {
   color: #EEE;
 }
-#admin-menu li li.hover a,
-#admin-menu li li.hover li.hover a,
-#admin-menu li li.hover li.hover li.hover a {
+#admin-menu li li.iehover a,
+#admin-menu li li.iehover li.iehover a,
+#admin-menu li li.iehover li.iehover li.iehover a {
   color: #FFF;
   width: 90%; /* IE */
 }
@@ -200,10 +203,11 @@ body.admin-menu {
 
 #admin-menu .admin-menu-search-results {
   display: block !important;
+  left: auto;
 }
 #admin-menu .admin-menu-search-results,
 #admin-menu .admin-menu-search-results li {
-  width: 186px
+  width: 186px;
 }
 
 #admin-menu li.highlight {
diff --git a/admin_menu.js b/admin_menu.js
index da850bc..e6496e2 100644
--- a/admin_menu.js
+++ b/admin_menu.js
@@ -201,17 +201,37 @@ Drupal.admin.behaviors.destination = function (context, settings, $adminMenu) {
  *   it will not run last.
  */
 Drupal.admin.behaviors.hover = function (context, settings, $adminMenu) {
-  // Hover emulation for IE 6 and delayed mouseout for all browsers.
-  $('li', $adminMenu).hover(function () {
-    clearTimeout(this.hoverTimer);
-    // Hide all siblings immediately.
-    $(this).addClass('hover').siblings().removeClass('hover');
-  }, function () {
-    var $this = $(this);
-    this.hoverTimer = setTimeout(function () {
-      $this.removeClass('hover');
-    }, 400);
-  });
+  // Hover emulation for IE 6.
+  if ($.browser.msie && parseInt(jQuery.browser.version) == 6) {
+    $('li', $adminMenu).hover(
+      function () {
+        $(this).addClass('iehover');
+      },
+      function () {
+        $(this).removeClass('iehover');
+      }
+    );
+  }
+
+  // Delayed mouseout.
+  $('li.expandable', $adminMenu).hover(
+    function () {
+      // Stop the timer.
+      clearTimeout(this.sfTimer);
+      // Display child lists.
+      $('> ul', this)
+        .css({left: 'auto', display: 'block'})
+        // Immediately hide nephew lists.
+        .parent().siblings('li').children('ul').css({left: '-999em', display: 'none'});
+    },
+    function () {
+      // Start the timer.
+      var uls = $('> ul', this);
+      this.sfTimer = setTimeout(function () {
+        uls.css({left: '-999em', display: 'none'});
+      }, 400);
+    }
+  );
 };
 
 /**
@@ -233,7 +253,7 @@ Drupal.admin.behaviors.search = function (context, settings, $adminMenu) {
         // Update needle and remove previous results.
         self.needle = event.target.value;
         $results.empty();
-        $('li, li a', $adminMenu).removeClass('hover highlight');
+        $('li', $adminMenu).removeClass('highlight');
 
         // Only search if the needle is longer than 3 characters.
         if (event.target.value.length >= 3) {
@@ -259,6 +279,9 @@ Drupal.admin.behaviors.search = function (context, settings, $adminMenu) {
               $match.trigger('mouseleave');
             });
           });
+          // Show the search results.
+          // @todo Why do they appear without this?
+          //$self.trigger('mouseenter');
         }
       }
     });
-- 
1.7.6.msysgit.0