cytoscape
Advanced tools
Comparing version 2.7.10 to 2.7.11
{ | ||
"name": "cytoscape", | ||
"version": "2.7.10", | ||
"version": "2.7.11", | ||
"license": "MIT", | ||
@@ -5,0 +5,0 @@ "description": "Graph theory (a.k.a. network) library for analysis and visualisation", |
# Cytoscape.js | ||
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/cytoscape/cytoscape.js/master/LICENSE) | ||
[![npm](https://img.shields.io/npm/v/cytoscape.svg?maxAge=2592000)](https://www.npmjs.com/package/cytoscape) | ||
[![npm installs](https://img.shields.io/npm/dt/cytoscape.svg?maxAge=2592000&label=npm installs)](https://www.npmjs.com/package/cytoscape) | ||
[![master branch tests](https://img.shields.io/travis/cytoscape/cytoscape.js/master.svg?maxAge=2592000&label=master%20branch)](https://travis-ci.org/cytoscape/cytoscape.js) | ||
[![unstable branch tests](https://img.shields.io/travis/cytoscape/cytoscape.js/unstable.svg?maxAge=2592000&label=unstable%20branch)](https://travis-ci.org/cytoscape/cytoscape.js) | ||
[![StackOverflow](https://img.shields.io/stackexchange/stackoverflow/t/cytoscape.js.svg?maxAge=2592000)](http://stackoverflow.com/questions/tagged/cytoscape.js) | ||
[![StackOverflow](https://img.shields.io/badge/ask%20question-on%20stackoverflow-brightgreen.svg?maxAge=2592000)](http://stackoverflow.com/questions/ask?tags=cytoscape.js) | ||
[![Gitter](https://img.shields.io/gitter/room/cytoscape/cytoscape.js.svg?maxAge=2592000)](https://gitter.im/cytoscape/cytoscape.js) | ||
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?maxAge=1)](https://raw.githubusercontent.com/cytoscape/cytoscape.js/master/LICENSE) | ||
[![npm](https://img.shields.io/npm/v/cytoscape.svg?maxAge=1)](https://www.npmjs.com/package/cytoscape) | ||
[![npm installs](https://img.shields.io/npm/dt/cytoscape.svg?maxAge=1&label=npm%20installs)](https://www.npmjs.com/package/cytoscape) | ||
[![master branch tests](https://img.shields.io/travis/cytoscape/cytoscape.js/master.svg?maxAge=1&label=master%20branch)](https://travis-ci.org/cytoscape/cytoscape.js) | ||
[![unstable branch tests](https://img.shields.io/travis/cytoscape/cytoscape.js/unstable.svg?maxAge=1&label=unstable%20branch)](https://travis-ci.org/cytoscape/cytoscape.js) | ||
@@ -12,0 +9,0 @@ |
@@ -30,3 +30,3 @@ 'use strict'; | ||
var _C = {}; | ||
var max; | ||
var max = 0; | ||
var C = { | ||
@@ -169,2 +169,5 @@ set: function( key, val ){ | ||
betweennessNormalized: function( node ){ | ||
if ( max == 0 ) | ||
return 0; | ||
if( is.string( node ) ){ | ||
@@ -171,0 +174,0 @@ var node = cy.filter( node ).id(); |
@@ -50,2 +50,4 @@ 'use strict'; | ||
closeness: function( node ){ | ||
if( maxCloseness == 0 ){ return 0; } | ||
if( is.string( node ) ){ | ||
@@ -52,0 +54,0 @@ // from is a selector string |
@@ -39,2 +39,5 @@ 'use strict'; | ||
degree: function( node ){ | ||
if( maxDegree == 0 ) | ||
return 0; | ||
if( is.string( node ) ){ | ||
@@ -74,2 +77,5 @@ // from is a selector string | ||
indegree: function( node ){ | ||
if ( maxIndegree == 0 ) | ||
return 0; | ||
if( is.string( node ) ){ | ||
@@ -86,2 +92,5 @@ // from is a selector string | ||
outdegree: function( node ){ | ||
if ( maxOutdegree == 0 ) | ||
return 0; | ||
if( is.string( node ) ){ | ||
@@ -88,0 +97,0 @@ // from is a selector string |
@@ -688,7 +688,7 @@ 'use strict'; | ||
var descs = this.descendants(); | ||
var descsEtc = descs.union( descs.union( this ).connectedEdges() ); | ||
var descsEtcJsons = descs.union( descs.union( this ).connectedEdges() ).jsons(); | ||
this.remove(); // NB: also removes descendants and their connected edges | ||
for( var i = 0; i < this.length; i++ ){ | ||
for( var i = 0; i < jsons.length; i++ ){ | ||
var json = jsons[i]; | ||
@@ -704,3 +704,3 @@ var ele = this[i]; | ||
return cy.add( jsons ).union( descsEtc.restore() ); | ||
return cy.add( jsons.concat( descsEtcJsons ) ); | ||
} | ||
@@ -707,0 +707,0 @@ } |
@@ -21,3 +21,11 @@ 'use strict'; | ||
image.addEventListener('load', onLoad); | ||
image.crossOrigin = 'Anonymous'; // prevent tainted canvas | ||
// #1582 safari doesn't load data uris with crossOrigin properly | ||
// https://bugs.webkit.org/show_bug.cgi?id=123978 | ||
var dataUriPrefix = 'data:'; | ||
var isDataUri = url.substring( 0, dataUriPrefix.length ).toLowerCase() === dataUriPrefix; | ||
if( !isDataUri ){ | ||
image.crossOrigin = 'Anonymous'; // prevent tainted canvas | ||
} | ||
image.src = url; | ||
@@ -24,0 +32,0 @@ |
@@ -990,3 +990,12 @@ 'use strict'; | ||
var diff = e.deltaY / -250 || e.wheelDeltaY / 1000 || e.wheelDelta / 1000; | ||
var diff; | ||
if( e.deltaY != null ){ | ||
diff = e.deltaY / -250; | ||
} else if( e.wheelDeltaY != null ){ | ||
diff = e.wheelDeltaY / 1000; | ||
} else { | ||
diff = e.wheelDelta / 1000; | ||
} | ||
diff = diff * r.wheelSensitivity; | ||
@@ -993,0 +1002,0 @@ |
@@ -253,3 +253,3 @@ 'use strict'; | ||
|| layer.eles.length >= maxElesPerLayer | ||
|| ( defNumLayers > 1 && !math.boundingBoxInBoundingBox( layer.bb, ele.boundingBox() ) ) | ||
|| !math.boundingBoxInBoundingBox( layer.bb, ele.boundingBox() ) | ||
){ | ||
@@ -256,0 +256,0 @@ // log('make new layer for ele %s', ele.id()); |
@@ -177,3 +177,6 @@ 'use strict'; | ||
if( !cxtProp ){ // no context prop means delete | ||
if( eleProp.bypass ){ | ||
if( !eleProp ){ | ||
continue; // no existing prop means nothing needs to be removed | ||
// nb affects initial application on mapped values like control-point-distances | ||
} else if( eleProp.bypass ){ | ||
cxtProp = { name: diffPropName, deleteBypassed: true }; | ||
@@ -180,0 +183,0 @@ } else { |
@@ -1,1 +0,1 @@ | ||
"2.7.10" | ||
"2.7.11" |
732649
21263
104