##// END OF EJS Templates
Merged r4935 and r4947 from trunk....
Jean-Philippe Lang -
r4850:91295ea6cdf4
parent child
Show More
@@ -11,7 +11,7 ContextMenu.prototype = {
11
11
12 if (!observingContextMenuClick) {
12 if (!observingContextMenuClick) {
13 Event.observe(document, 'click', this.Click.bindAsEventListener(this));
13 Event.observe(document, 'click', this.Click.bindAsEventListener(this));
14 Event.observe(document, (window.opera ? 'click' : 'contextmenu'), this.RightClick.bindAsEventListener(this));
14 Event.observe(document, 'contextmenu', this.RightClick.bindAsEventListener(this));
15 observingContextMenuClick = true;
15 observingContextMenuClick = true;
16 }
16 }
17
17
@@ -23,8 +23,6 ContextMenu.prototype = {
23 this.hideMenu();
23 this.hideMenu();
24 // do not show the context menu on links
24 // do not show the context menu on links
25 if (Event.element(e).tagName == 'A') { return; }
25 if (Event.element(e).tagName == 'A') { return; }
26 // right-click simulated by Alt+Click with Opera
27 if (window.opera && !e.altKey) { return; }
28 var tr = Event.findElement(e, 'tr');
26 var tr = Event.findElement(e, 'tr');
29 if (tr == document || tr == undefined || !tr.hasClassName('hascontextmenu')) { return; }
27 if (tr == document || tr == undefined || !tr.hasClassName('hascontextmenu')) { return; }
30 Event.stop(e);
28 Event.stop(e);
@@ -39,7 +37,6 ContextMenu.prototype = {
39 Click: function(e) {
37 Click: function(e) {
40 this.hideMenu();
38 this.hideMenu();
41 if (Event.element(e).tagName == 'A') { return; }
39 if (Event.element(e).tagName == 'A') { return; }
42 if (window.opera && e.altKey) { return; }
43 if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {
40 if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {
44 var tr = Event.findElement(e, 'tr');
41 var tr = Event.findElement(e, 'tr');
45 if (tr!=null && tr!=document && tr.hasClassName('hascontextmenu')) {
42 if (tr!=null && tr!=document && tr.hasClassName('hascontextmenu')) {
General Comments 0
You need to be logged in to leave comments. Login now