Merged r4935 and r4947 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4970 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
d0f4b5aa50
commit
91295ea6cd
|
@ -11,7 +11,7 @@ ContextMenu.prototype = {
|
||||||
|
|
||||||
if (!observingContextMenuClick) {
|
if (!observingContextMenuClick) {
|
||||||
Event.observe(document, 'click', this.Click.bindAsEventListener(this));
|
Event.observe(document, 'click', this.Click.bindAsEventListener(this));
|
||||||
Event.observe(document, (window.opera ? 'click' : 'contextmenu'), this.RightClick.bindAsEventListener(this));
|
Event.observe(document, 'contextmenu', this.RightClick.bindAsEventListener(this));
|
||||||
observingContextMenuClick = true;
|
observingContextMenuClick = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -23,8 +23,6 @@ ContextMenu.prototype = {
|
||||||
this.hideMenu();
|
this.hideMenu();
|
||||||
// do not show the context menu on links
|
// do not show the context menu on links
|
||||||
if (Event.element(e).tagName == 'A') { 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');
|
var tr = Event.findElement(e, 'tr');
|
||||||
if (tr == document || tr == undefined || !tr.hasClassName('hascontextmenu')) { return; }
|
if (tr == document || tr == undefined || !tr.hasClassName('hascontextmenu')) { return; }
|
||||||
Event.stop(e);
|
Event.stop(e);
|
||||||
|
@ -39,7 +37,6 @@ ContextMenu.prototype = {
|
||||||
Click: function(e) {
|
Click: function(e) {
|
||||||
this.hideMenu();
|
this.hideMenu();
|
||||||
if (Event.element(e).tagName == 'A') { return; }
|
if (Event.element(e).tagName == 'A') { return; }
|
||||||
if (window.opera && e.altKey) { return; }
|
|
||||||
if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {
|
if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {
|
||||||
var tr = Event.findElement(e, 'tr');
|
var tr = Event.findElement(e, 'tr');
|
||||||
if (tr!=null && tr!=document && tr.hasClassName('hascontextmenu')) {
|
if (tr!=null && tr!=document && tr.hasClassName('hascontextmenu')) {
|
||||||
|
|
Loading…
Reference in New Issue