Skip to content

Commit

Permalink
2.2.2 final
Browse files Browse the repository at this point in the history
  • Loading branch information
@sporritt
sporritt committed Oct 20, 2016
1 parent 393d245 commit 669c2aa
Show file tree
Hide file tree
Showing 34 changed files with 82 additions and 65 deletions.
4 changes: 2 additions & 2 deletions bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsPlumb",
"version": "2.2.1",
"version": "2.2.2",
"ignore": [
"demo",
"dist/apidocs",
Expand Down Expand Up @@ -31,7 +31,7 @@
"test"
],
"main": [
"dist/js/jsPlumb-2.2.1.js"
"dist/js/jsPlumb-2.2.2.js"
],
"homepage": "https://jsplumbtoolkit.com",
"authors": [
Expand Down
2 changes: 1 addition & 1 deletion dist/apidocs/data.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"project": {
"name": "jsplumb",
"description": "Visual connectivity for webapps",
"version": "2.2.1",
"version": "2.2.2",
"url": ""
},
"files": {
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/animation/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - animation</title>
<title>jsPlumb 2.2.2 demo - animation</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -66,7 +66,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/chart/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - chart</title>
<title>jsPlumb 2.2.2 demo - chart</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -68,7 +68,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/draggableConnectors/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - draggableConnectors</title>
<title>jsPlumb 2.2.2 demo - draggableConnectors</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -67,7 +67,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/dynamicAnchors/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - dynamicAnchors</title>
<title>jsPlumb 2.2.2 demo - dynamicAnchors</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -68,7 +68,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/flowchart/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - flowchart</title>
<title>jsPlumb 2.2.2 demo - flowchart</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -66,7 +66,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/groups/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - groups</title>
<title>jsPlumb 2.2.2 demo - groups</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -158,7 +158,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/perimeterAnchors/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - perimeterAnchors</title>
<title>jsPlumb 2.2.2 demo - perimeterAnchors</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -68,7 +68,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/sourcesAndTargets/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - sourcesAndTargets</title>
<title>jsPlumb 2.2.2 demo - sourcesAndTargets</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -71,7 +71,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions dist/demo/statemachine/dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no"/>
<link rel="shortcut icon" type="image/png" href="../../img/favicon.png">
<title>jsPlumb 2.2.1 demo - statemachine</title>
<title>jsPlumb 2.2.2 demo - statemachine</title>


<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
Expand Down Expand Up @@ -77,7 +77,7 @@
<!-- /demo -->
</div>

<script src="../../js/jsPlumb-2.2.1-min.js"></script>
<script src="../../js/jsPlumb-2.2.2-min.js"></script>

<script src="demo.js"></script>
<script src="../../js/demo-list.js"></script>
Expand Down
8 changes: 7 additions & 1 deletion dist/doc/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@
</ul>
</div>
<div class="markdown-body col-xs-9">
<h2>2.1.1</h2>
<h2>2.2.2</h2>

<ul>
<li>corrected deployment issue in 2.2.1. 2.2.1 does not do what it says; it is an impostor.</li>
</ul>

<h2>2.2.1</h2>

<ul>
<li><p>upgrade to Katavorio 0.18.0; now <code>rank</code> is supported in <code>dropOptions</code> to <code>makeTarget</code> or <code>addEndpoint</code>. Use this when
Expand Down
7 changes: 0 additions & 7 deletions dist/js/jsPlumb-2.2.1-min.js
View file

This file was deleted.

7 changes: 7 additions & 0 deletions dist/js/jsPlumb-2.2.2-min.js
View file

Large diffs are not rendered by default.

35 changes: 21 additions & 14 deletions dist/js/jsPlumb-2.2.1.js → dist/js/jsPlumb-2.2.2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1795,6 +1795,7 @@
if (intersectingDroppables.length > 0 && ghostProxyOffsets) {
params.setPosition(this.el, ghostProxyOffsets);
}
intersectingDroppables.sort(_rankSort);
for (var i = 0; i < intersectingDroppables.length; i++) {
var retVal = intersectingDroppables[i].drop(this, e);
if (retVal === true) break;
Expand Down Expand Up @@ -1877,6 +1878,7 @@
var Drop = function(el, params, css, scope) {
this._class = css.droppable;
this.params = params || {};
this.rank = params.rank || 0;
this._activeClass = this.params.activeClass || css.active;
this._hoverClass = this.params.hoverClass || css.hover;
Super.apply(this, arguments);
Expand Down Expand Up @@ -1932,6 +1934,10 @@
}));
};

var _rankSort = function(a,b) {
return a.rank < b.rank ? 1 : a.rank > b.rank ? -1 : 0;
};

var _gel = function(el) {
if (el == null) return null;
el = (typeof el === "string" || el.constructor == String) ? document.getElementById(el) : el;
Expand Down Expand Up @@ -1985,6 +1991,7 @@
}
}
}
dd.sort(_rankSort);
return dd;
},
_prepareParams = function(p) {
Expand Down Expand Up @@ -2408,7 +2415,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -2880,7 +2887,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -2949,7 +2956,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -6091,7 +6098,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -6626,7 +6633,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -6895,7 +6902,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -8159,7 +8166,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -8707,7 +8714,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -9866,7 +9873,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -11374,7 +11381,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -12208,7 +12215,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -12887,7 +12894,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -12925,7 +12932,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down Expand Up @@ -13516,7 +13523,7 @@
/*
* jsPlumb
*
* Title:jsPlumb 2.2.1
* Title:jsPlumb 2.2.2
*
* Provides a way to visually connect elements on an HTML page, using SVG.
*
Expand Down
4 changes: 2 additions & 2 deletions dist/tests/loadtest-dom.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!doctype html>
<html>
<head>
<title>jsPlumb 2.2.1 load test harness</title>
<title>jsPlumb 2.2.2 load test harness</title>
<meta http-equiv="content-type" content="text/html;charset=utf-8" />
<link rel="shortcut icon" type="image/png" href="../img/favicon.png">

Expand All @@ -11,7 +11,7 @@
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link href="//fonts.googleapis.com/css?family=Lato:400,700" rel="stylesheet">
<link rel="stylesheet" href="../css/main.css">
<script src="../js/jsPlumb-2.2.1-min.js"></script>
<script src="../js/jsPlumb-2.2.2-min.js"></script>
</head>
<body class="loadtest">
<div>
Expand Down
2 changes: 1 addition & 1 deletion dist/tests/qunit-svg-dom-instance.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<link rel="stylesheet" href="qunit-1.11.0.css">
<script src="qunit-1.11.0.js"></script>

<script src="../js/jsPlumb-2.2.1-min.js"></script>
<script src="../js/jsPlumb-2.2.2-min.js"></script>

<!-- TEST -->
<script src="jsPlumb-tests.js"></script>
Expand Down
Loading

0 comments on commit 669c2aa

Please sign in to comment.