Skip to content
Snippets Groups Projects
Commit 07e35004 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

remove drag and drop functionality for tags in messages view, fixes #2568

Closes #2568

Merge request studip/studip!1783
parent e7eada25
No related branches found
No related tags found
No related merge requests found
Pipeline #12605 passed
......@@ -44,8 +44,8 @@ STUDIP.domReady(() => {
var more_indicator = jQuery('#reloader').detach();
jQuery('#loaded').val(parseInt(jQuery('#loaded').val(), 10) + 1);
jQuery.each(response.messages, function(index, message) {
STUDIP.Messages.createDraggable(message).appendTo('#messages > tbody');
jQuery.each(response.messages, (index, message) => {
jQuery(message).appendTo('#messages > tbody');
});
if (response.more) {
......@@ -60,21 +60,6 @@ STUDIP.domReady(() => {
);
}
/*********** dragging the messages to the tags ***********/
jQuery('#messages > tbody').on('mouseover touchstart', function() {
if ($('html').is('.responsive-display') || jQuery('#messages-tags ul > li').length === 0) {
jQuery('#messages > tbody > tr').draggable('disable');
} else {
jQuery('#messages > tbody > tr').draggable('enable');
}
});
$('#messages > tbody > tr').each(STUDIP.Messages.createDraggable)
jQuery('#messages > tbody').trigger('touchstart');
jQuery('.widget-links li:has(.tag)').each(STUDIP.Messages.createDroppable);
jQuery(document).on('click', '.adressee .remove_adressee', STUDIP.Messages.remove_adressee);
jQuery(document).on('click', '.file .remove_attachment', STUDIP.Messages.remove_attachment);
});
......@@ -245,49 +245,7 @@ const Messages = {
$(container).append(html);
});
$('#messages-tags')
.toggle(tags.length !== 0)
.find('li:has(.tag):not(.ui-droppable)')
.each(Messages.createDroppable);
},
createDroppable: function(element) {
jQuery(arguments.length === 1 ? element : this).droppable({
hoverClass: 'dropping',
drop: function(event, ui) {
var message_id = ui.draggable.attr('id').substr(ui.draggable.attr('id').lastIndexOf('_') + 1),
tag = jQuery(this)
.text()
.trim();
jQuery
.post(STUDIP.URLHelper.getURL('dispatch.php/messages/tag/' + message_id), {
add_tag: tag
})
.then(function(response, status, xhr) {
var tags = jQuery.parseJSON(xhr.getResponseHeader('X-Tags'));
Messages.setTags(message_id, tags);
});
}
});
},
createDraggable: function(element) {
return $(arguments.length === 1 ? element : this).draggable({
//cursor: "move",
distance: 10,
cursorAt: { left: 28, top: 15 },
helper() {
const title = $(this).find('.title').text().trim();
return $('<div id="message-move-handle">').text(title);
},
revert: true,
revertDuration: '200',
appendTo: 'body',
zIndex: 1000,
start() {
$('#messages-tags').addClass('dragging');
},
stop() {
$('#messages-tags').removeClass('dragging');
}
});
.toggle(tags.length !== 0);
},
toggleSetting: function(name) {
jQuery('#' + name).toggle('fade');
......
......@@ -6,32 +6,11 @@
font-weight: bold;
}
.dropping {
background-color: $content-color;
a {
color: $white;
}
}
a.message-tag {
$white-space: nowrap;
@include icon(before, tag, clickable);
}
#message-move-handle {
background-color: rgba(255, 255, 255, 0.3);
padding: 3px;
border-radius: 5px;
border: thin solid $black;
@include icon(before, mail, clickable, 20px, 2px);
}
#messages-tags.dragging .sidebar-widget-content {
background-color: $activity-color-20;
}
#statusbar_container {
> .statusbar {
border: thin solid $light-gray-color;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment