Updating jsPlumb library

--HG--
branch : 1.x

src/Orchard.Web/Modules/Orchard.Workflows/Orchard.Workflows.csproj

@@ -72,7 +72,7 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Scripts\jquery.jsPlumb-1.3.16-all-min.js" />
+    <Content Include="Scripts\jquery.jsPlumb-1.4.1-all-min.js" />
     <Content Include="Scripts\orchard-workflows-serialize.js" />
     <Content Include="Scripts\orchard-workflows.js" />
     <Content Include="Styles\images\menu.workflows.png" />

src/Orchard.Web/Modules/Orchard.Workflows/ResourceManifest.cs

@@ -37,6 +37,7 @@ namespace Orchard.Workflows {
                 "WorkflowsActivities-UserTask"
                 );
 
+            builder.Add().DefineScript("jsPlumb").SetUrl("jquery.jsPlumb-1.4.1-all-min.js").SetDependencies("jQueryUI");
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Workflows/Scripts/orchard-workflows-serialize.js

@@ -77,8 +77,7 @@ var loadActivities = function (localId) {
         jsPlumb.connect({
             source: ep,
             target: connection.TargetId,
-            newConnection: true
-
+            deleteEndpointsOnDetach: false
         });
     }
 

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

@@ -16,11 +16,12 @@
         paintStyle: { fillStyle: '#225588' },
         isSource: true,
         isTarget: false,
+        deleteEndpointsOnDetach: false,
         connector: ["Flowchart"], // gap needs to be the same as makeTarget.paintStyle.radius
         connectorStyle: connectorPaintStyle,
         hoverPaintStyle: connectorHoverStyle,
         connectorHoverStyle: connectorHoverStyle,
-        overlays: [["Label", { location: [0.5, 1.5], cssClass: "sourceEndpointLabel" }]]
+        overlays: [["Label", { location: [3, -1.5], cssClass: "sourceEndpointLabel" }]]
     };
 
     jsPlumb.bind("ready", function () {
@@ -36,7 +37,7 @@
             // the overlays to decorate each connection with.  note that the label overlay uses a function to generate the label text; in this
             // case it returns the 'labelText' member that we set on each connection in the 'init' method below.
             ConnectionOverlays: [
-                ["Arrow", { width: 12, length: 12, location: 1 }],
+                ["Arrow", { width: 12, length: 12, location: -5 }],
                 // ["Label", { location: 0.1, id: "label", cssClass: "aLabel" }]
             ],
             ConnectorZIndex: 5
@@ -73,8 +74,10 @@
     $('.activity-toolbox-item').draggable({ helper: 'clone' });
     $('#activity-editor').droppable({ drop: function(event, ui) {
         var activityName = ui.draggable.data('activity-name');
-        createActivity(activityName, event.pageY, event.pageX);
+        if (activityName && activityName.length) {
+            createActivity(activityName, event.pageY, event.pageX);
         }
+    }
     });
 
     var renderActivity = function (clientId, id, name, state, start, top, left) {
@@ -143,7 +146,7 @@
 
                     elt.endpoints[outcomes[i]] = ep;
                     ep.outcome = outcomes[i];
-                    //ep.setLabel(outcomes[i]);
+                    // ep.overlays[0].setLabel(outcomes[i]);
                 }
 
                 if (activities[name].hasForm) {

src/Orchard.Web/Modules/Orchard.Workflows/Views/Admin/Edit.cshtml

@@ -6,10 +6,8 @@
     Layout.Title = @T("Edit Workflow {0}", Model.WorkflowDefinition.Name);
     Style.Require("WorkflowsAdmin");
     Style.Require("WorkflowsActivities");
-    Script.Require("jQueryUI");
     Style.Require("jQueryUI_Orchard");
-    Script.Include("jquery.jsPlumb-1.3.16-all-min.js");
-    
+    Script.Require("jsPlumb");    
     Script.Include("orchard-workflows.js").AtFoot();
     Script.Include("orchard-workflows-serialize.js").AtFoot();
 }