cytoscape
Advanced tools
Comparing version 2.7.21 to 2.7.22
/*! | ||
Cytoscape.js 2.7.21 (MIT licensed) | ||
Cytoscape.js 2.7.22 (MIT licensed) | ||
@@ -6,0 +6,0 @@ Copyright (c) The Cytoscape Consortium |
{ | ||
"name": "cytoscape", | ||
"version": "2.7.21", | ||
"version": "2.7.22", | ||
"license": "MIT", | ||
@@ -5,0 +5,0 @@ "description": "Graph theory (a.k.a. network) library for analysis and visualisation", |
@@ -1359,2 +1359,4 @@ 'use strict'; | ||
var segmentsN = Math.min( segmentWs.pfValue.length, segmentDs.pfValue.length ); | ||
var srcArrShape = edge.pstyle('source-arrow-shape').value; | ||
var tgtArrShape = edge.pstyle('target-arrow-shape').value; | ||
@@ -1400,2 +1402,8 @@ var srcX1 = rs.lastSrcCtlPtX; | ||
var srcArr1 = rs.lastSrcArr; | ||
var srcArr2 = srcArrShape; | ||
var tgtArr1 = rs.lastTgtArr; | ||
var tgtArr2 = tgtArrShape; | ||
if( badBezier ){ | ||
@@ -1416,2 +1424,4 @@ rs.badBezier = true; | ||
&& edgeDistances1 === edgeDistances2 | ||
&& srcArr1 === srcArr2 | ||
&& tgtArr1 === tgtArr2 | ||
&& ((edgeIndex1 === edgeIndex2 && numEdges1 === numEdges2) || edgeIsUnbundled) ){ | ||
@@ -1437,2 +1447,4 @@ continue; // then the control points haven't changed and we can skip calculating them | ||
rs.lastEdgeDistances = edgeDistances2; | ||
rs.lastSrcArr = srcArr2; | ||
rs.lastTgtArr = tgtArr2; | ||
} | ||
@@ -1811,3 +1823,3 @@ | ||
// always override as haystack in case set to different type previously | ||
rscratch.edgeType = 'haystack'; | ||
rscratch.lastCurveStyle = rscratch.edgeType = 'haystack'; | ||
rscratch.haystack = true; | ||
@@ -1814,0 +1826,0 @@ |
@@ -70,8 +70,2 @@ 'use strict'; | ||
if( options.bg ){ | ||
buffCxt.fillStyle = options.bg; | ||
buffCxt.rect( 0, 0, width, height ); | ||
buffCxt.fill(); | ||
} | ||
buffCxt.globalCompositeOperation = 'source-over'; | ||
@@ -86,2 +80,5 @@ | ||
this.drawElements( buffCxt, zsortedEles ); | ||
buffCxt.scale( 1/scale, 1/scale ); | ||
buffCxt.translate( bb.x1 * scale, bb.y1 * scale ); | ||
} else { // draw the current view | ||
@@ -101,3 +98,15 @@ var pan = cy.pan(); | ||
this.drawElements( buffCxt, zsortedEles ); | ||
buffCxt.scale( 1/scale, 1/scale ); | ||
buffCxt.translate( -translation.x, -translation.y ); | ||
} | ||
// need to fill bg at end like this in order to fill cleared transparent pixels in jpgs | ||
if( options.bg ){ | ||
buffCxt.globalCompositeOperation = 'destination-over'; | ||
buffCxt.fillStyle = options.bg; | ||
buffCxt.rect( 0, 0, width, height ); | ||
buffCxt.fill(); | ||
} | ||
} | ||
@@ -104,0 +113,0 @@ |
@@ -1,1 +0,1 @@ | ||
module.exports = "2.7.21"; | ||
module.exports = "2.7.22"; |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
4339632
44096