Merged trunk r1773.
git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -28,11 +28,11 @@ ContextMenu.prototype = {
|
||||
RightClick: function(e) {
|
||||
this.hideMenu();
|
||||
// do not show the context menu on links
|
||||
if (Event.findElement(e, 'a') != document) { return; }
|
||||
if (Event.element(e).tagName == 'A') { return; }
|
||||
// right-click simulated by Alt+Click with Opera
|
||||
if (window.opera && !e.altKey) { return; }
|
||||
var tr = Event.findElement(e, 'tr');
|
||||
if ((tr == document) || !tr.hasClassName('hascontextmenu')) { return; }
|
||||
if (tr == document || tr == undefined || !tr.hasClassName('hascontextmenu')) { return; }
|
||||
Event.stop(e);
|
||||
if (!this.isSelected(tr)) {
|
||||
this.unselectAll();
|
||||
@@ -44,14 +44,14 @@ ContextMenu.prototype = {
|
||||
|
||||
Click: function(e) {
|
||||
this.hideMenu();
|
||||
if (Event.findElement(e, 'a') != document) { return; }
|
||||
if (Event.element(e).tagName == 'A') { return; }
|
||||
if (window.opera && e.altKey) { return; }
|
||||
if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {
|
||||
var tr = Event.findElement(e, 'tr');
|
||||
if (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) {
|
||||
if (box!=document && box!=undefined) {
|
||||
// a checkbox may be clicked
|
||||
if (box.checked) {
|
||||
tr.addClassName('context-menu-selection');
|
||||
@@ -90,6 +90,9 @@ ContextMenu.prototype = {
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
this.RightClick(e);
|
||||
}
|
||||
},
|
||||
|
||||
showMenu: function(e) {
|
||||
|
||||
Reference in New Issue
Block a user