Skip to content

Commit a130136

Browse files
committed
Prep v0.6.2 release
1 parent a4dde5d commit a130136

File tree

9 files changed

+30
-233
lines changed

9 files changed

+30
-233
lines changed

CHANGELOG.md

Lines changed: 0 additions & 211 deletions
This file was deleted.

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dagre",
3-
"version": "0.6.1",
3+
"version": "0.6.2",
44
"main": [
55
"dist/dagre.core.js",
66
"dist/dagre.core.min.js"
@@ -21,7 +21,7 @@
2121
"test/**"
2222
],
2323
"dependencies": {
24-
"graphlib": "^0.9.1",
24+
"graphlib": "^1.0.1",
2525
"lodash": "^2.4.1"
2626
}
2727
}

dist/dagre.core.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2918,6 +2918,6 @@ function notime(name, fn) {
29182918
}
29192919

29202920
},{"./graphlib":8,"./lodash":11}],31:[function(require,module,exports){
2921-
module.exports = "0.6.1";
2921+
module.exports = "0.6.2";
29222922

29232923
},{}]},{},[1]);

dist/dagre.core.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/dagre.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2918,7 +2918,7 @@ function notime(name, fn) {
29182918
}
29192919

29202920
},{"./graphlib":8,"./lodash":11}],31:[function(require,module,exports){
2921-
module.exports = "0.6.1";
2921+
module.exports = "0.6.2";
29222922

29232923
},{}],32:[function(require,module,exports){
29242924
/**
@@ -3810,14 +3810,9 @@ Graph.prototype.setPath = function(vs, value) {
38103810
* setEdge(v, w, [value, [name]])
38113811
* setEdge({ v, w, [name] }, [value])
38123812
*/
3813-
Graph.prototype.setEdge = function(v, w, value, name) {
3814-
var valueSpecified = arguments.length > 2;
3815-
3816-
v = String(v);
3817-
w = String(w);
3818-
if (!_.isUndefined(name)) {
3819-
name = String(name);
3820-
}
3813+
Graph.prototype.setEdge = function() {
3814+
var v, w, name, value,
3815+
valueSpecified = false;
38213816

38223817
if (_.isPlainObject(arguments[0])) {
38233818
v = arguments[0].v;
@@ -3827,6 +3822,20 @@ Graph.prototype.setEdge = function(v, w, value, name) {
38273822
value = arguments[1];
38283823
valueSpecified = true;
38293824
}
3825+
} else {
3826+
v = arguments[0];
3827+
w = arguments[1];
3828+
name = arguments[3];
3829+
if (arguments.length > 2) {
3830+
value = arguments[2];
3831+
valueSpecified = true;
3832+
}
3833+
}
3834+
3835+
v = "" + v;
3836+
w = "" + w;
3837+
if (!_.isUndefined(name)) {
3838+
name = "" + name;
38303839
}
38313840

38323841
var e = edgeArgsToId(this._isDirected, v, w, name);
@@ -4042,7 +4051,7 @@ function read(json) {
40424051
},{"./graph":47,"./lodash":50}],50:[function(require,module,exports){
40434052
module.exports=require(11)
40444053
},{"/Users/cpettitt/projects/dagre/lib/lodash.js":11,"lodash":52}],51:[function(require,module,exports){
4045-
module.exports = '0.9.1';
4054+
module.exports = '1.0.1';
40464055

40474056
},{}],52:[function(require,module,exports){
40484057
(function (global){

dist/dagre.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module.exports = "0.6.2-pre";
1+
module.exports = "0.6.2";

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dagre",
3-
"version": "0.6.2-pre",
3+
"version": "0.6.2",
44
"description": "Graph layout for JavaScript",
55
"author": "Chris Pettitt <[email protected]>",
66
"main": "index.js",
@@ -9,7 +9,7 @@
99
"layout"
1010
],
1111
"dependencies": {
12-
"graphlib": "^0.9.1",
12+
"graphlib": "^1.0.1",
1313
"lodash": "^2.4.1"
1414
},
1515
"devDependencies": {
@@ -36,4 +36,4 @@
3636
"url": "https://github.com/cpettitt/dagre.git"
3737
},
3838
"license": "MIT"
39-
}
39+
}

src/release/release.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ echo Attemping to publish version: $VERSION
2323
[ -n "$PROJECT" ] || bail "No project name was specified."
2424
[ -n "$DIST_DIR" ] || bail "No dist dir was specified."
2525
[ -z "`git tag -l v$VERSION`" ] || bail "Version already published. Skipping publish."
26-
[ -n "`grep v$SHORT_VERSION CHANGELOG.md`" ] || bail "ERROR: No entry for v$VERSION in CHANGELOG.md"
2726
[ "`git rev-parse HEAD`" = "`git rev-parse master`" ] || [ -n "$PRE_RELEASE" ] || bail "ERROR: You must release from the master branch"
2827
[ -z "`git status --porcelain`" ] || bail "ERROR: Dirty index on working tree. Use git status to check"
2928

0 commit comments

Comments
 (0)