extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix calendar d-n-d not showing forbiden sign when try to drop in not accepted area

Browse Source
This commit is contained in:
Hadi Nategh 2014-01-24 16:04:11 +00:00
parent 5d64f040c0
commit 1e726cedac
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/js/app.js
View File

@ -213,14 +213,9 @@ app.classes.calendar = AppJS.extend(
//Droppable //Droppable
jQuery("div[id^='drop_']").droppable( jQuery("div[id^='drop_']").droppable(
{ {
accept:function(dg) accept:function()
{ {
return true;
var id = dg[0].getAttribute('id');
var calOwner = id.substring(id.lastIndexOf("_O")+2,id.lastIndexOf("_C"));
var dpOwner = this.getAttribute('data-owner');
if (dpOwner == null) dpOwner = calOwner;
return dg[0].getAttribute('id').match(/drag/g) && calOwner == dpOwner;
}, },
tolerance:'pointer', tolerance:'pointer',
@ -237,7 +232,7 @@ app.classes.calendar = AppJS.extend(
} }
else else
{ {
jQuery(event.draggable).draggable("option","revert",true);
} }
}, },
@ -248,13 +243,13 @@ app.classes.calendar = AppJS.extend(
var dgOwner = dgId.substring(dgId.lastIndexOf("_C")+2,dgId.lastIndexOf("")); var dgOwner = dgId.substring(dgId.lastIndexOf("_C")+2,dgId.lastIndexOf(""));
var dpOwner = ui.target.getAttribute('data-owner'); var dpOwner = ui.target.getAttribute('data-owner');
if (dpOwner == null) dpOwner = dgOwner; if (dpOwner == null) dpOwner = dgOwner;
if (dpOwner == dgOwner ) if (dpOwner === dgOwner )
{ {
event.helper[0].innerHTML = '<div style="font-size: 1.1em; font-weight: bold; text-align: center;">'+timeDemo+'</div>'; event.helper[0].innerHTML = '<div class="calendar_d-n-d_timeCounter">'+timeDemo+'</div>';
} }
else else
{ {
event.helper[0].innerHTML = '<div style="background-color: red; height: 100%; width: 100%; text-align: center;">' + 'Forbidden' + '</div>'; event.helper[0].innerHTML = '<div class="calendar_d-n-d_forbiden"></div>';
} }
} }
}); });

19
calendar/templates/default/app.css
View File

@ -542,3 +542,22 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
margin: -2px -1px 0px -2px; margin: -2px -1px 0px -2px;
width:410px; width:410px;
} }
/**
* Calendar Drag and Drop
*
*/
//Class for div to show forbiden drop
.calendar_d-n-d_forbiden
{
background-color: red;
height: 100%;
width: 100%;
text-align: center;
}
//Class for div to demonstrate dragging time
.calendar_d-n-d_timeCounter
{
font-size: 1.1em;
font-weight: bold;
text-align: center;
}