lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-07-16 21:04:17 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing that Workflows activities are not measured in relative coordinates

Browse Source
This commit is contained in:
Lombiq 2015-11-24 14:23:20 +01:00
parent 188fabe233
commit c5fb96ca4f
2 changed files with 594 additions and 574 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows.js
View File

@ -75,10 +75,18 @@
$('#activity-editor').droppable({ drop: function(event, ui) {
var activityName = ui.draggable.data('activity-name');
if (activityName && activityName.length) {
createActivity(activityName, event.pageY, event.pageX);
var offset = $(this).offset();
if (displaySaveMessage()) {
createActivity(activityName, event.pageY - offset.top - 40, event.pageX - offset.left); /* The displaySaveMessage's height is 40px */
}
else {
createActivity(activityName, event.pageY - offset.top, event.pageX - offset.left);
}
}
if (displaySaveMessage()) {
var activityPosition = ui.position;
activityPosition.top += 40; /* The displaySaveMessage's height is 40px */
}
displaySaveMessage();
}
});
@ -174,8 +182,11 @@
elt.viewModel.edit = edit;
}
var canvasWidth = $('#activity-editor').width();
var domWidth = $('#' + clientId).width() + 25; /* width + padding */
dom.css('top', top + 'px');
dom.css('left', left + 'px');
dom.css('left', left + domWidth > canvasWidth ? canvasWidth - domWidth : left + 'px');
jsPlumb.repaint(elt.viewModel.clientId);
dom.on("click", function () {
@ -246,7 +257,15 @@
}
function displaySaveMessage() {
$("#save-message").show();
var saveMessage = $("#save-message");
if (saveMessage.css('display') === "none") {
saveMessage.show();
return true;
}
else {
return false;
}
}
var refreshToolbar = function(target) {

1
src/Orchard.Web/Modules/Orchard.Workflows/Styles/orchard-workflows-admin.css
View File

@ -88,6 +88,7 @@
}
#workflow-container {
position: relative;
}
#editor-wrapper {