jro_apps/redmine Commit - r8709:daacea11dc2b

Do not hide context menu when clicking on a folder menu item....

Jean-Philippe Lang -

r8709:daacea11dc2b

parent child

Context file:

r8709:daacea11dc2b

Collapse all files

app/views/context_menus/issues.html.erb +1 -1

             <ul>
               <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
             <% if !@issue.nil? -%>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
                       :class => 'icon-edit', :disabled => !@can[:edit] %></li>
             <% end %>
               <% 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,
                                               :selected => (@issue && s == @issue.status), :disabled => !@can[:update] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% unless @trackers.nil? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_tracker) %></a>
                 <ul>
                 <% @trackers.each do |t| -%>
                     <li><%= context_menu_link h(t.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'tracker_id' => t}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && t == @issue.tracker), :disabled => !@can[:edit] %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_priority) %></a>
                 <ul>
                 <% @priorities.each do |p| -%>
                     <li><%= context_menu_link h(p.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'priority_id' => p}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && p == @issue.priority), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% #TODO: allow editing versions when multiple projects %>
               <% unless @project.nil? || @project.shared_versions.open.empty? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
                 <ul>
                 <% @project.shared_versions.open.sort.each do |v| -%>
                     <li><%= context_menu_link format_version_name(v), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => v}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && v == @issue.fixed_version), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'fixed_version_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% if @assignables.present? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
                 <ul>
                 <% if @assignables.include?(User.current) %>
                     <li><%= context_menu_link "<< #{l(:label_me)} >>", {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => User.current}, :back_url => @back}, :method => :post,
                                               :disabled => !@can[:update] %></li>
                 <% end %>
                 <% @assignables.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'assigned_to_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end %>
               <% unless @project.nil? || @project.issue_categories.empty? -%>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_category) %></a>
                 <ul>
                 <% @project.issue_categories.each do |u| -%>
                     <li><%= context_menu_link h(u.name), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'category_id' => u}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
                 <% end -%>
                     <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'category_id' => 'none'}, :back_url => @back}, :method => :post,
                                               :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
                 </ul>
               </li>
               <% end -%>
               <% if Issue.use_field_for_done_ratio? %>
               <li class="folder">
                 <a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
                 <ul>
                 <% (0..10).map{|x|x*10}.each do |p| -%>
                     <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_update', :ids => @issues.collect(&:id), :issue => {'done_ratio' => p}, :back_url => @back}, :method => :post,
                                                   :selected => (@issue && p == @issue.done_ratio), :disabled => (!@can[:edit] || @issues.detect {|i| !i.leaf?}) %></li>
                 <% end -%>
                 </ul>
               </li>
               <% end %>
               <% @options_by_custom_field.each do |field, options| %>
                 <li class="folder">
                   <a href="#" class="submenu"><%= h(field.name) %></a>
                   <ul>
                   <% options.each do |text, value| %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, text, value || text) %></li>
                   <% end %>
                   <% unless field.is_required? %>
                     <li><%= bulk_update_custom_field_context_menu_link(field, l(:label_none), '') %></li>
                   <% end %>
                   </ul>
                 </li>
               <% end %>
             <% if !@issue.nil? %>
               <% if @can[:log_time] -%>
               <li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue},
                       :class => 'icon-time-add' %></li>
               <% end %>
               <% if User.current.logged? %>
               <li><%= watcher_link(@issue, User.current) %></li>
               <% end %>
             <% end %>
             <% if @issue.present? %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
                       :class => 'icon-copy', :disabled => !@can[:copy] %></li>
             <% else %>
               <li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), :copy => '1'},
                                       :class => 'icon-copy', :disabled => !@can[:move] %></li>
             <% end %>
               <li><%= context_menu_link l(:button_delete), issues_path(:ids => @issues.collect(&:id), :back_url => @back),
                                         :method => :delete, :confirm => issues_destroy_confirmation_message(@issues), :class => 'icon-del', :disabled => !@can[:delete] %></li>
               <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
             </ul>

public/javascripts/context_menu.js +4 0

             /* redMine - project management software
                Copyright (C) 2006-2008  Jean-Philippe Lang */
             var observingContextMenuClick;
             ContextMenu = Class.create();
             ContextMenu.prototype = {
             	initialize: function (url) {
             	this.url = url;
             	this.createMenu();
             	if (!observingContextMenuClick) {
             		Event.observe(document, 'click', this.Click.bindAsEventListener(this));
             		Event.observe(document, 'contextmenu', this.RightClick.bindAsEventListener(this));
             		observingContextMenuClick = true;
             	}
             	this.unselectAll();
             	this.lastSelected = null;
             	},
             	RightClick: function(e) {
             		this.hideMenu();
             		// do not show the context menu on links
             		if (Event.element(e).tagName == 'A') { return; }
             		var tr = Event.findElement(e, 'tr');
             		if (tr == document || tr == undefined  || !tr.hasClassName('hascontextmenu')) { return; }
             		Event.stop(e);
             		if (!this.isSelected(tr)) {
             			this.unselectAll();
             			this.addSelection(tr);
             			this.lastSelected = tr;
             		}
             		this.showMenu(e);
             	},
               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/))) {
                   var tr = Event.findElement(e, 'tr');
                   if (tr!=null && tr!=document && tr.hasClassName('hascontextmenu')) {
                     // a row was clicked, check if the click was on checkbox
                     var box = Event.findElement(e, 'input');
                     if (box!=document && box!=undefined) {
                       // a checkbox may be clicked
                       if (box.checked) {
                         tr.addClassName('context-menu-selection');
                       } else {
                         tr.removeClassName('context-menu-selection');
                       }
                     } else {
                       if (e.ctrlKey || e.metaKey) {
                         this.toggleSelection(tr);
                       } else if (e.shiftKey) {
                         if (this.lastSelected != null) {
                           var toggling = false;
                           var rows = $$('.hascontextmenu');
                           for (i=0; i<rows.length; i++) {
                             if (toggling || rows[i]==tr) {
                               this.addSelection(rows[i]);
                             }
                             if (rows[i]==tr || rows[i]==this.lastSelected) {
                               toggling = !toggling;
                             }
                           }
                         } else {
                           this.addSelection(tr);
                         }
                       } else {
                         this.unselectAll();
                         this.addSelection(tr);
                       }
                       this.lastSelected = tr;
                     }
                   } else {
                     // click is outside the rows
                     var t = Event.findElement(e, 'a');
                     if (t == document || t == undefined) {
                       this.unselectAll();
                     } else {
                       if (Element.hasClassName(t, 'disabled') || Element.hasClassName(t, 'submenu')) {
                         Event.stop(e);
                       }
                     }
                   }
                 }
               },
               createMenu: function() {
                 if (!$('context-menu')) {
                   var menu = document.createElement("div");
                   menu.setAttribute("id", "context-menu");
                   menu.setAttribute("style", "display:none;");
                   document.getElementById("content").appendChild(menu);
                 }
               },
               showMenu: function(e) {
                 var mouse_x = Event.pointerX(e);
                 var mouse_y = Event.pointerY(e);
                 var render_x = mouse_x;
                 var render_y = mouse_y;
                 var dims;
                 var menu_width;
                 var menu_height;
                 var window_width;
                 var window_height;
                 var max_width;
                 var max_height;
                 $('context-menu').style['left'] = (render_x + 'px');
                 $('context-menu').style['top'] = (render_y + 'px');
                 Element.update('context-menu', '');
                 new Ajax.Updater({success:'context-menu'}, this.url,
                   {asynchronous:true,
                    method: 'get',
                    evalScripts:true,
                    parameters:Form.serialize(Event.findElement(e, 'form')),
                    onComplete:function(request){
             				 dims = $('context-menu').getDimensions();
             				 menu_width = dims.width;
             				 menu_height = dims.height;
             				 max_width = mouse_x + 2*menu_width;
             				 max_height = mouse_y + menu_height;
             				 var ws = window_size();
             				 window_width = ws.width;
             				 window_height = ws.height;
             				 /* display the menu above and/or to the left of the click if needed */
             				 if (max_width > window_width) {
             				   render_x -= menu_width;
             				   $('context-menu').addClassName('reverse-x');
             				 } else {
             					 $('context-menu').removeClassName('reverse-x');
             				 }
             				 if (max_height > window_height) {
             				   render_y -= menu_height;
             				   $('context-menu').addClassName('reverse-y');
             				 } else {
             					 $('context-menu').removeClassName('reverse-y');
             				 }
             				 if (render_x <= 0) render_x = 1;
             				 if (render_y <= 0) render_y = 1;
             				 $('context-menu').style['left'] = (render_x + 'px');
             				 $('context-menu').style['top'] = (render_y + 'px');
                      Effect.Appear('context-menu', {duration: 0.20});
                      if (window.parseStylesheets) { window.parseStylesheets(); } // IE
                   }})
               },
               hideMenu: function() {
                 Element.hide('context-menu');
               },
               addSelection: function(tr) {
                 tr.addClassName('context-menu-selection');
                 this.checkSelectionBox(tr, true);
                 this.clearDocumentSelection();
               },
               toggleSelection: function(tr) {
                 if (this.isSelected(tr)) {
                   this.removeSelection(tr);
                 } else {
                   this.addSelection(tr);
                 }
               },
               removeSelection: function(tr) {
                 tr.removeClassName('context-menu-selection');
                 this.checkSelectionBox(tr, false);
               },
               unselectAll: function() {
                 var rows = $$('.hascontextmenu');
                 for (i=0; i<rows.length; i++) {
                   this.removeSelection(rows[i]);
                 }
               },
               checkSelectionBox: function(tr, checked) {
               	var inputs = Element.getElementsBySelector(tr, 'input');
               	if (inputs.length > 0) { inputs[0].checked = checked; }
               },
               isSelected: function(tr) {
                 return Element.hasClassName(tr, 'context-menu-selection');
               },
               clearDocumentSelection: function() {
                 if (document.selection) {
                   document.selection.clear(); // IE
                 } else {
                   window.getSelection().removeAllRanges();
                 }
               }
             }
             function toggleIssuesSelection(el) {
             	var boxes = el.getElementsBySelector('input[type=checkbox]');
             	var all_checked = true;
             	for (i = 0; i < boxes.length; i++) { if (boxes[i].checked == false) { all_checked = false; } }
             	for (i = 0; i < boxes.length; i++) {
             		if (all_checked) {
             			boxes[i].checked = false;
             			boxes[i].up('tr').removeClassName('context-menu-selection');
             		} else if (boxes[i].checked == false) {
             			boxes[i].checked = true;
             			boxes[i].up('tr').addClassName('context-menu-selection');
             		}
             	}
             }
             function window_size() {
                 var w;
                 var h;
                 if (window.innerWidth) {
             	w = window.innerWidth;
             	h = window.innerHeight;
                 } else if (document.documentElement) {
             	w = document.documentElement.clientWidth;
             	h = document.documentElement.clientHeight;
                 } else {
             	w = document.body.clientWidth;
             	h = document.body.clientHeight;
                 }
                 return {width: w, height: h};
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages