LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for bug #536. 

Monotone-Parent: e5138baadcbf7f196e37747707b570897665a6d3
Monotone-Revision: 4038e1c81a3afe4ac83664ba6c3a983a6a52c21e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-03-31T20:44:22
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-03-31 20:44:22 +00:00
parent 4ae82de32f
commit 7826181ff7
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/WebServerResources/SchedulerUIDnD.js
View File

@ -977,7 +977,7 @@ SOGoEventDragController.prototype = {
onDragStart: function SEDC_onDragStart(event) {
var target = getTarget(event);
if (target.nodeType == 1) {
if (eventIsLeftClick(event) && (target.nodeType == 1)) {
if ((!this.eventCells
&& (target.hasClassName("clickableHourCell")
|| target.hasClassName("day"))

27
UI/WebServerResources/generic.js
View File

@ -407,6 +407,21 @@ function refreshOpener() {
/* selection mechanism */
function eventIsLeftClick(event) {
var isLeftClick = true;
if (isMac() && isSafari())
if (event.ctrlKey == 1)
isLeftClick = false; // Control-click is equivalent to right-click under Mac OS X
else if (event.metaKey == 1) // Command-click
isLeftClick = true;
else
isLeftClick = Event.isLeftClick(event);
else
isLeftClick = Event.isLeftClick(event);
return isLeftClick;
}
function deselectAll(parent) {
for (var i = 0; i < parent.childNodes.length; i++) {
var node = parent.childNodes.item(i);
@ -464,20 +479,10 @@ function onRowClick(event) {
}
var initialSelection = $(node.parentNode).getSelectedNodes();
var isLeftClick = true;
if (isMac() && isSafari())
if (event.ctrlKey == 1)
isLeftClick = false; // Control-click is equivalent to right-click under Mac OS X
else if (event.metaKey == 1) // Command-click
isLeftClick = true;
else
isLeftClick = Event.isLeftClick(event);
else
isLeftClick = Event.isLeftClick(event);
if (initialSelection.length > 0
&& initialSelection.indexOf(node) >= 0
&& !isLeftClick)
&& !eventIsLeftClick(event))
// Ignore non primary-click (ie right-click) inside current selection
return true;