From fb9daa750a6af814e0d66e292cc0ce35de305e20 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 16 Dec 2013 16:45:57 -0800
Subject: [PATCH] CRM-13930 - fix jquery.menu namespace

---
 CRM/Core/BAO/Navigation.php         | 6 +++---
 CRM/Core/Resources.php              | 2 +-
 templates/CRM/common/Navigation.tpl | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CRM/Core/BAO/Navigation.php b/CRM/Core/BAO/Navigation.php
index 20e5188b42..3ad5ca88c8 100644
--- a/CRM/Core/BAO/Navigation.php
+++ b/CRM/Core/BAO/Navigation.php
@@ -604,13 +604,13 @@ ORDER BY parent_id, weight";
           module_exists('admin_menu') && user_access('access administration menu')
         )
       ) {
-        $prepandString = "<li class=\"menumain crm-link-home\">" . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('Drupal Menu') . "</a></li></ul>";
+        $prepandString = '<li class="menumain crm-link-home">' . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . '</a></li><li><a href="#" class="crm-hidemenu">' . ts('Drupal Menu') . "</a></li></ul>";
       }
       elseif ($config->userSystem->is_wordpress) {
-        $prepandString = "<li class=\"menumain crm-link-home\">" . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . "</a></li><li><a href=\"#\" onclick=\"cj.Menu.closeAll( );cj('#civicrm-menu').toggle( );\">" . ts('WordPress Menu') . "</a></li></ul>";
+        $prepandString = '<li class="menumain crm-link-home">' . $homeIcon . "<ul id=\"civicrm-home\"><li><a href=\"{$homeURL}\">" . $homeLabel . '</a></li><li><a href="#" class="crm-hidemenu">' . ts('WordPress Menu') . "</a></li></ul>";
       }
       else {
-        $prepandString = "<li class=\"menumain crm-link-home\"><a href=\"{$homeURL}\" title=\"" . $homeLabel . "\">" . $homeIcon . "</a>";
+        $prepandString = "<li class=\"menumain crm-link-home\"><a href=\"{$homeURL}\" title=\"" . $homeLabel . '">' . $homeIcon . "</a>";
       }
 
       $navigation = $prepandString . $navigation . $appendString;
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 919cb3503e..c9ead5ed52 100644
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -541,7 +541,7 @@ class CRM_Core_Resources {
       "packages/jquery/plugins/jquery.autocomplete.js",
       "packages/jquery/css/jquery.autocomplete.css",
 
-      "packages/jquery/plugins/jquery.menu.pack.js",
+      "packages/jquery/plugins/jquery.menu$min.js",
       "packages/jquery/css/menu.css",
 
       "packages/jquery/plugins/jquery.tableHeader.js",
diff --git a/templates/CRM/common/Navigation.tpl b/templates/CRM/common/Navigation.tpl
index b1f5c84195..36aa47ebdb 100644
--- a/templates/CRM/common/Navigation.tpl
+++ b/templates/CRM/common/Navigation.tpl
@@ -53,7 +53,7 @@
     {/if}
     {$navigation}
   </ul>
-{/strip}{/capture}// Generated {$timeGenerated}
+{/strip}{/capture}// <script> Generated {$timeGenerated}
 {literal}
 (function($) {
   var menuMarkup = {/literal}{$menuMarkup|@json_encode};
@@ -111,6 +111,11 @@ $('#civicrm-menu').ready(function() {
   $('#sort_name_navigation').keydown(function() {
     $.Menu.closeAll();
   });
+  $('.crm-hidemenu').click(function() {
+    $.Menu.closeAll();
+    $('#civicrm-menu').slideUp();
+    return false;
+  });
   $('.crm-quickSearchField').click(function() {
     var label = $(this).text();
     var value = $('input', this).val();
@@ -143,5 +148,5 @@ $('#civicrm-menu').ready(function() {
     }
   });
 });
-$('#civicrm-menu').menu({arrowSrc: CRM.config.resourceBase + 'packages/jquery/css/images/arrow.png'});
+$('#civicrm-menu').menuBar({arrowSrc: CRM.config.resourceBase + 'packages/jquery/css/images/arrow.png'});
 })(cj);{/literal}
-- 
2.25.1