summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-02-09 20:25:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-02-09 20:25:01 +0000
commitdaacea11dc2bd7b889b83b2ecc58152188f91953 (patch)
tree51bfc8c4c251813e6fe6f3d021a0fcb938d9cda5
parente1072a3c4fb83ed27ca3b208b7e8ffe20b2a588f (diff)
downloadredmine-daacea11dc2bd7b889b83b2ecc58152188f91953.tar.gz
redmine-daacea11dc2bd7b889b83b2ecc58152188f91953.zip
Do not hide context menu when clicking on a folder menu item.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8829 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/context_menus/issues.html.erb2
-rw-r--r--public/javascripts/context_menu.js4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/context_menus/issues.html.erb b/app/views/context_menus/issues.html.erb
index b621db003..e2b87944c 100644
--- a/app/views/context_menus/issues.html.erb
+++ b/app/views/context_menus/issues.html.erb
@@ -11,7 +11,7 @@
<% if @allowed_statuses.present? %>
<li class="folder">
- <a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
+ <a href="#" class="submenu"><%= l(:field_status) %></a>
<ul>
<% @allowed_statuses.each do |s| -%>
<li><%= context_menu_link h(s.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {:status_id => s}, :back_url => @back}, :method => :post,
diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 8005a22b4..a383ebe00 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -35,6 +35,10 @@ ContextMenu.prototype = {
},
Click: function(e) {
+ if (Event.element(e).tagName == 'A' && Event.element(e).hasClassName('submenu')) {
+ Event.stop(e)
+ return;
+ }
this.hideMenu();
if (Event.element(e).tagName == 'A' || Event.element(e).tagName == 'IMG') { return; }
if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {