Upgrade JsPlumb version to v2.2.0

Ericsson · Feb 16, 2018 · 7c570eb · 7c570eb
1 parent 12c738c
commit 7c570eb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/scripts/build_package.py b/scripts/build_package.py
@@ -608,15 +608,16 @@ def build_package(repository_root, build_package_config, env=None):
     jsplumb_root = os.path.join(repository_root, jsplumb_dep.get('directory'))
     target = os.path.join(package_root, package_layout['web_client_jsplumb'])
     jsplumb = os.path.join(jsplumb_root, 'dist', 'js',
-                           'jquery.jsPlumb-1.7.6-min.js')
+                           'jsPlumb-2.2.0-min.js')
     shutil.copy(jsplumb, target)
 
     # Add jQuery for JsPlumb.
+    jquery_dep = vendor_projects['jquery']
+    jquery_root = os.path.join(repository_root, jquery_dep.get('directory'))
     target = os.path.join(target, 'external')
     if not os.path.exists(target):
         os.mkdir(target)
-    jquery = os.path.join(jsplumb_root, 'external',
-                          'jquery-1.9.0-min.js')
+    jquery = os.path.join(jquery_root, 'jquery-1.9.0-min.js')
     shutil.copy(jquery, target)
 
     # config files

diff --git a/vendor_projects.json b/vendor_projects.json
@@ -39,15 +39,28 @@
   {
     "name":"jsplumb",
     "directory":"vendor/jsplumb",
-    "version":"1.7.6",
+    "version":"2.2.0",
     "description":"jsplumb",
     "homepage":"https://jsplumbtoolkit.com/",
     "repository":{
       "type":"git",
-      "git_tag":"1.7.6",
+      "git_tag":"2.2.0",
       "url":"https://github.com/sporritt/jsPlumb.git"
     }
   },
+  {
+    "name":"jquery",
+    "directory":"vendor/jquery",
+    "version":"1.9.0",
+    "description":"jquery",
+    "homepage":"https://jquery.com/",
+    "source_package":{
+      "download_cmd":"curl",
+      "url":"https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.0/jquery.min.js",
+      "option":"-o",
+      "name":"jquery-1.9.0-min.js"
+    }
+  },
   {
     "name":"marked",
     "directory":"vendor/marked",

diff --git a/www/index.html b/www/index.html
@@ -20,7 +20,7 @@
   <!-- Third party libraries -->
 
   <script type="text/javascript" src="scripts/plugins/jsplumb/external/jquery-1.9.0-min.js"></script>
-  <script type="text/javascript" src="scripts/plugins/jsplumb/jquery.jsPlumb-1.7.6-min.js"></script>
+  <script type="text/javascript" src="scripts/plugins/jsplumb/jsPlumb-2.2.0-min.js"></script>
   <script type="text/javascript" src="scripts/plugins/thrift/thrift.js"></script>
   <script type="text/javascript" src="scripts/plugins/marked/marked.min.js"></script>
   <script type="text/javascript" src="scripts/plugins/codemirror/dist/codemirror.min.js"></script>

diff --git a/www/products.html b/www/products.html
@@ -18,7 +18,6 @@
   <!-- Third party libraries -->
 
   <script type="text/javascript" src="scripts/plugins/jsplumb/external/jquery-1.9.0-min.js"></script>
-  <script type="text/javascript" src="scripts/plugins/jsplumb/jquery.jsPlumb-1.7.6-min.js"></script>
   <script type="text/javascript" src="scripts/plugins/thrift/thrift.js"></script>
   <script type="text/javascript" src="scripts/plugins/marked/marked.min.js"></script>
 

diff --git a/www/scripts/codecheckerviewer/BugViewer.js b/www/scripts/codecheckerviewer/BugViewer.js
@@ -44,7 +44,8 @@ function (declare, domClass, dom, style, fx, Toggler, keys, on, query, Memory,
       Container : jsPlumbParentElement,
       Anchor : ['Perimeter', { shape : 'Ellipse' }],
       Endpoint : ['Dot', { radius : 1 }],
-      PaintStyle : { strokeStyle : '#a94442', lineWidth : 2 },
+      PaintStyle : { stroke : '#a94442', strokeWidth : 2 },
+      Connector:[ "Bezier", { curviness: 10 }],
       ConnectionsDetachable : false,
       ConnectionOverlays : [['Arrow',
         { location : 1, length : 10, width : 8 }]]