Skip to content

Commit

Permalink
Preparing to publish 3.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxkfranz
maxkfranz committed Nov 17, 2017
1 parent 59a4ffc commit 0ea48d3
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 90 deletions.
80 changes: 42 additions & 38 deletions dist/cytoscape.cjs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2836,7 +2836,7 @@ var util = __webpack_require__(1);
var is = __webpack_require__(0);
var Event = __webpack_require__(15);

var eventRegex = /(\w+)(\.(?:\w+|\*))?/; // regex for matching event strings (e.g. "click.namespace")
var eventRegex = /^([^.]+)(\.(?:[^.]+))?$/; // regex for matching event strings (e.g. "click.namespace")
var universalNamespace = '.*'; // matches as if no namespace specified and prevents users from unbinding accidentally

var defaults = {
Expand Down Expand Up @@ -3621,7 +3621,8 @@ var Element = function Element(cy, params, restore) {
edges: [], // array of connected edges
children: [], // array of children
parent: null, // parent ref
traversalCache: {} // cache of output of traversal functions
traversalCache: {}, // cache of output of traversal functions
backgrounding: false // whether background images are loading
};

// renderedPosition overrides if specified
Expand Down Expand Up @@ -4717,7 +4718,7 @@ module.exports = Stylesheet;
"use strict";


module.exports = "3.2.5";
module.exports = "3.2.6";

/***/ }),
/* 23 */
Expand Down Expand Up @@ -22720,8 +22721,6 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
nodeWidth = node.width() + 2 * padding;
nodeHeight = node.height() + 2 * padding;

context.lineWidth = node.pstyle('border-width').pfValue;

//
// setup shift

Expand All @@ -22737,16 +22736,18 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {

var bgImgProp = node.pstyle('background-image');
var urls = bgImgProp.value;
var url = void 0;
var urlDefined = [];
var image = [];
var numImages = urls.length;
for (var i = 0; i < numImages; i++) {
url = urls[i];
urlDefined[i] = url != null && url !== 'none';
if (urlDefined[i]) {
var urlDefined = new Array(urls.length);
var image = new Array(urls.length);
var numImages = 0;
for (var i = 0; i < urls.length; i++) {
var url = urls[i];
var defd = urlDefined[i] = url != null && url !== 'none';

if (defd) {
var bgImgCrossOrigin = node.cy().style().getIndexedStyle(node, 'background-image-crossorigin', 'value', i);

numImages++;

// get image, and if not loaded then ask to redraw when later loaded
image[i] = r.getCachedImage(url, bgImgCrossOrigin, function () {
node.emitAndNotify('background');
Expand All @@ -22767,24 +22768,6 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {

context.lineJoin = 'miter'; // so borders are square with the node shape

if (context.setLineDash) {
// for very outofdate browsers
switch (borderStyle) {
case 'dotted':
context.setLineDash([1, 1]);
break;

case 'dashed':
context.setLineDash([4, 2]);
break;

case 'solid':
case 'double':
context.setLineDash([]);
break;
}
}

var setupShapeColor = function setupShapeColor() {
var bgOpy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : bgOpacity;

Expand Down Expand Up @@ -22846,7 +22829,7 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
var prevBging = _p.backgrounding;
var totalCompleted = 0;

for (var _i = 0; _i < numImages; _i++) {
for (var _i = 0; _i < image.length; _i++) {
if (urlDefined[_i] && image[_i].complete && !image[_i].error) {
totalCompleted++;
r.drawInscribedImage(context, image[_i], node, _i, nodeOpacity);
Expand Down Expand Up @@ -22897,6 +22880,27 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
var drawBorder = function drawBorder() {
if (borderWidth > 0) {

context.lineWidth = borderWidth;
context.lineCap = 'butt';

if (context.setLineDash) {
// for very outofdate browsers
switch (borderStyle) {
case 'dotted':
context.setLineDash([1, 1]);
break;

case 'dashed':
context.setLineDash([4, 2]);
break;

case 'solid':
case 'double':
context.setLineDash([]);
break;
}
}

if (usePaths) {
context.stroke(path);
} else {
Expand All @@ -22917,6 +22921,12 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {

context.globalCompositeOperation = gco;
}

// reset in case we changed the border style
if (context.setLineDash) {
// for very outofdate browsers
context.setLineDash([]);
}
}
};

Expand Down Expand Up @@ -22974,12 +22984,6 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
drawText();
drawOverlay();

// reset in case we changed the border style
if (context.setLineDash) {
// for very outofdate browsers
context.setLineDash([]);
}

//
// clean up shift

Expand Down
80 changes: 42 additions & 38 deletions dist/cytoscape.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2836,7 +2836,7 @@ var util = __webpack_require__(1);
var is = __webpack_require__(0);
var Event = __webpack_require__(15);

var eventRegex = /(\w+)(\.(?:\w+|\*))?/; // regex for matching event strings (e.g. "click.namespace")
var eventRegex = /^([^.]+)(\.(?:[^.]+))?$/; // regex for matching event strings (e.g. "click.namespace")
var universalNamespace = '.*'; // matches as if no namespace specified and prevents users from unbinding accidentally

var defaults = {
Expand Down Expand Up @@ -3621,7 +3621,8 @@ var Element = function Element(cy, params, restore) {
edges: [], // array of connected edges
children: [], // array of children
parent: null, // parent ref
traversalCache: {} // cache of output of traversal functions
traversalCache: {}, // cache of output of traversal functions
backgrounding: false // whether background images are loading
};

// renderedPosition overrides if specified
Expand Down Expand Up @@ -4744,7 +4745,7 @@ module.exports = Stylesheet;
"use strict";


module.exports = "3.2.5";
module.exports = "3.2.6";

/***/ }),
/* 24 */
Expand Down Expand Up @@ -22747,8 +22748,6 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
nodeWidth = node.width() + 2 * padding;
nodeHeight = node.height() + 2 * padding;

context.lineWidth = node.pstyle('border-width').pfValue;

//
// setup shift

Expand All @@ -22764,16 +22763,18 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {

var bgImgProp = node.pstyle('background-image');
var urls = bgImgProp.value;
var url = void 0;
var urlDefined = [];
var image = [];
var numImages = urls.length;
for (var i = 0; i < numImages; i++) {
url = urls[i];
urlDefined[i] = url != null && url !== 'none';
if (urlDefined[i]) {
var urlDefined = new Array(urls.length);
var image = new Array(urls.length);
var numImages = 0;
for (var i = 0; i < urls.length; i++) {
var url = urls[i];
var defd = urlDefined[i] = url != null && url !== 'none';

if (defd) {
var bgImgCrossOrigin = node.cy().style().getIndexedStyle(node, 'background-image-crossorigin', 'value', i);

numImages++;

// get image, and if not loaded then ask to redraw when later loaded
image[i] = r.getCachedImage(url, bgImgCrossOrigin, function () {
node.emitAndNotify('background');
Expand All @@ -22794,24 +22795,6 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {

context.lineJoin = 'miter'; // so borders are square with the node shape

if (context.setLineDash) {
// for very outofdate browsers
switch (borderStyle) {
case 'dotted':
context.setLineDash([1, 1]);
break;

case 'dashed':
context.setLineDash([4, 2]);
break;

case 'solid':
case 'double':
context.setLineDash([]);
break;
}
}

var setupShapeColor = function setupShapeColor() {
var bgOpy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : bgOpacity;

Expand Down Expand Up @@ -22873,7 +22856,7 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
var prevBging = _p.backgrounding;
var totalCompleted = 0;

for (var _i = 0; _i < numImages; _i++) {
for (var _i = 0; _i < image.length; _i++) {
if (urlDefined[_i] && image[_i].complete && !image[_i].error) {
totalCompleted++;
r.drawInscribedImage(context, image[_i], node, _i, nodeOpacity);
Expand Down Expand Up @@ -22924,6 +22907,27 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
var drawBorder = function drawBorder() {
if (borderWidth > 0) {

context.lineWidth = borderWidth;
context.lineCap = 'butt';

if (context.setLineDash) {
// for very outofdate browsers
switch (borderStyle) {
case 'dotted':
context.setLineDash([1, 1]);
break;

case 'dashed':
context.setLineDash([4, 2]);
break;

case 'solid':
case 'double':
context.setLineDash([]);
break;
}
}

if (usePaths) {
context.stroke(path);
} else {
Expand All @@ -22944,6 +22948,12 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {

context.globalCompositeOperation = gco;
}

// reset in case we changed the border style
if (context.setLineDash) {
// for very outofdate browsers
context.setLineDash([]);
}
}
};

Expand Down Expand Up @@ -23001,12 +23011,6 @@ CRp.drawNode = function (context, node, shiftToOriginWithBb, drawLabel) {
drawText();
drawOverlay();

// reset in case we changed the border style
if (context.setLineDash) {
// for very outofdate browsers
context.setLineDash([]);
}

//
// clean up shift

Expand Down
6 changes: 3 additions & 3 deletions dist/cytoscape.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion documentation/docmaker.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.2.5",
"version": "3.2.6",

"fnArgLinks": {
"selector": "#selectors",
Expand Down
10 changes: 5 additions & 5 deletions documentation/index.html
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions documentation/js/cytoscape.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cytoscape",
"version": "3.2.5",
"version": "3.2.6",
"license": "MIT",
"description": "Graph theory (a.k.a. network) library for analysis and visualisation",
"homepage": "http://js.cytoscape.org",
Expand Down
2 changes: 1 addition & 1 deletion src/version.js
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = "3.2.5";
module.exports = "3.2.6";

0 comments on commit 0ea48d3

Please sign in to comment.