extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 23:29:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cancel d-n-d action on taglist item edit button

Browse Source
This commit is contained in:
Hadi Nategh 2014-10-29 17:15:14 +00:00
parent 5098baf538
commit 2fe71bdc48
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mail/js/app.js
View File

@ -3936,9 +3936,9 @@ app.classes.mail = AppJS.extend(
set_dragging_dndCompose: function ()
{
var zIndex = 100;
var self = this;
jQuery('div.ms-sel-item:not(div.ui-draggable)').draggable({
var dragItem = jQuery('div.ms-sel-item:not(div.ui-draggable)');
dragItem.draggable({
appendTo:'body',
//Performance wise better to not add ui-draggable class to items since we are not using that class
containment:'document',
@ -3946,7 +3946,7 @@ app.classes.mail = AppJS.extend(
cursor:'move',
cursorAt:{left:2},
//cancel dragging on close button to avoid conflict with close action
cancel:'.ms-close-btn',
cancel:'.ms-close-btn, .ms-edit-btn',
/**
* function to act on draggable item on revert's event
* @returns {Boolean} return true
@ -3963,14 +3963,14 @@ app.classes.mail = AppJS.extend(
*/
start:function(event, ui)
{
if (event.ctrlKey)
var dragItem = jQuery(this);
if (event.ctrlKey || event.metaKey)
{
jQuery(this)
.addClass('mailCompose_copyEmail')
dragItem.addClass('mailCompose_copyEmail')
.css('cursor','copy');
}
jQuery(this).css ('z-index',zIndex++);
jQuery(this).css('position','absolute');
dragItem.css ('z-index',zIndex++);
dragItem.css('position','absolute');
},
/**
*
@ -3992,12 +3992,13 @@ app.classes.mail = AppJS.extend(
{
var self = this;
var emailTags = jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc');
//Call to make new items draggable
jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').hover(function(){
emailTags.hover(function(){
self.set_dragging_dndCompose();
});
//Make used email-tag list widgets in mail compose droppable
jQuery('#mail-compose_to,#mail-compose_cc,#mail-compose_bcc').droppable({
emailTags.droppable({
access:'.ms-sel-item',
/**

4
mail/templates/pixelegg/app.css
View File

@ -1310,7 +1310,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
padding-right: 5px;
}
#mail-compose .mailComposeHeaders span.ms-close-btn,
#mail-compose .mailComposeHeadersSection span.ms-close-btn {
#mail-compose .mailComposeHeadersSection span.ms-close-btn,
#mail-compose .mailComposeHeaders span.ms-edit-btn,
#mail-compose .mailComposeHeadersSection span.ms-edit-btn {
width: auto;
background-repeat: no-repeat;
padding-right: 8px;

2
mail/templates/pixelegg/app.less
View File

@ -569,7 +569,7 @@ div#mail-index{
padding-right: 5px;
}
span.ms-close-btn {
span.ms-close-btn, span.ms-edit-btn{
width: auto;
background-repeat: no-repeat;
padding-right: 8px;