Mercurial > hg > soundsoftware-site
diff public/javascripts/.svn/text-base/context_menu.js.svn-base @ 441:cbce1fd3b1b7 redmine-1.2
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:24:13 +0100 |
parents | 051f544170fe |
children |
line wrap: on
line diff
--- a/public/javascripts/.svn/text-base/context_menu.js.svn-base Thu Mar 03 11:42:28 2011 +0000 +++ b/public/javascripts/.svn/text-base/context_menu.js.svn-base Mon Jun 06 14:24:13 2011 +0100 @@ -36,7 +36,7 @@ Click: function(e) { this.hideMenu(); - if (Event.element(e).tagName == 'A') { return; } + 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')) { @@ -50,7 +50,7 @@ tr.removeClassName('context-menu-selection'); } } else { - if (e.ctrlKey) { + if (e.ctrlKey || e.metaKey) { this.toggleSelection(tr); } else if (e.shiftKey) { if (this.lastSelected != null) {