Skip to content

Commit

Permalink
preparing to publish 2.6.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@maxkfranz
maxkfranz committed Apr 21, 2016
1 parent 027e9df commit 4cb9d81
Show file tree
Hide file tree
Showing 11 changed files with 114 additions and 84 deletions.
63 changes: 40 additions & 23 deletions dist/cytoscape.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13906,12 +13906,14 @@ BRp.load = function() {
r.hoverData.which = e.which;

var cy = r.cy;
var pos = r.projectIntoViewport(e.clientX, e.clientY);
var gpos = [ e.clientX, e.clientY ];
var pos = r.projectIntoViewport( gpos[0], gpos[1] );
var select = r.selection;
var near = r.findNearestElement(pos[0], pos[1], true, false);
var draggedElements = r.dragData.possibleDragElements;

r.hoverData.mdownPos = pos;
r.hoverData.mdownGPos = gpos;

var checkForTaphold = function(){
r.hoverData.tapholdCancelled = false;
Expand Down Expand Up @@ -14080,7 +14082,10 @@ BRp.load = function() {

var cy = r.cy;
var zoom = cy.zoom();
var pos = r.projectIntoViewport(e.clientX, e.clientY);
var gpos = [ e.clientX, e.clientY ];
var pos = r.projectIntoViewport( gpos[0], gpos[1] );
var mdownPos = r.hoverData.mdownPos;
var mdownGPos = r.hoverData.mdownGPos;
var select = r.selection;

var near = null;
Expand All @@ -14094,16 +14099,19 @@ BRp.load = function() {

var draggedElements = r.dragData.possibleDragElements;

var dx = select[2] - select[0];
var dx2 = dx * dx;
var dy = select[3] - select[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;
var rdist2 = dist2 * zoom * zoom;
var isOverThresholdDrag;

var multSelKeyDown = isMultSelKeyDown( e );
if( mdownGPos ){
var dx = gpos[0] - mdownGPos[0];
var dx2 = dx * dx;
var dy = gpos[1] - mdownGPos[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;

var isOverThresholdDrag = rdist2 >= r.desktopTapThreshold2;
isOverThresholdDrag = dist2 >= r.desktopTapThreshold2;
}

var multSelKeyDown = isMultSelKeyDown( e );

if (isOverThresholdDrag) {
r.hoverData.tapholdCancelled = true;
Expand Down Expand Up @@ -14497,6 +14505,8 @@ BRp.load = function() {
r.dragData.didDrag = false;
r.hoverData.dragged = false;
r.hoverData.dragDelta = [];
r.hoverData.mdownPos = null;
r.hoverData.mdownGPos = null;

}, false);

Expand Down Expand Up @@ -14611,7 +14621,6 @@ BRp.load = function() {
if (e.touches[1]) { var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY); now[2] = pos[0]; now[3] = pos[1]; }
if (e.touches[2]) { var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY); now[4] = pos[0]; now[5] = pos[1]; }


// record starting points for pinch-to-zoom
if( e.touches[1] ){

Expand Down Expand Up @@ -14760,11 +14769,14 @@ BRp.load = function() {
// Tap, taphold
// -----

r.touchData.startPosition = [];
for (var i=0; i<now.length; i++) {
earlier[i] = now[i];
r.touchData.startPosition[i] = now[i];
}

r.touchData.startGPosition = [ e.touches[0].clientX, e.touches[0].clientY ];

r.touchData.singleTouchMoved = false;
r.touchData.singleTouchStartTime = +new Date();

Expand All @@ -14791,27 +14803,30 @@ BRp.load = function() {

var touchmoveHandler;
r.registerBinding(window, 'touchmove', touchmoveHandler = function(e) {

var select = r.selection;
var capture = r.touchData.capture;
var cy = r.cy;
var now = r.touchData.now; var earlier = r.touchData.earlier;
var now = r.touchData.now;
var earlier = r.touchData.earlier;
var zoom = cy.zoom();

if (e.touches[0]) { var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY); now[0] = pos[0]; now[1] = pos[1]; }
if (e.touches[1]) { var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY); now[2] = pos[0]; now[3] = pos[1]; }
if (e.touches[2]) { var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY); now[4] = pos[0]; now[5] = pos[1]; }

var disp = []; for (var j=0;j<now.length;j++) { disp[j] = now[j] - earlier[j]; }
var startPos = r.touchData.startPosition;
var dx = now[0] - startPos[0];
var dx2 = dx * dx;
var dy = now[1] - startPos[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;
var rdist2 = dist2 * zoom * zoom;
var isOverThresholdDrag;

var isOverThresholdDrag = rdist2 >= r.touchTapThreshold2;
if( capture && e.touches[0] ){
var disp = []; for (var j=0;j<now.length;j++) { disp[j] = now[j] - earlier[j]; }
var startGPos = r.touchData.startGPosition;
var dx = e.touches[0].clientX - startGPos[0];
var dx2 = dx * dx;
var dy = e.touches[0].clientY - startGPos[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;

isOverThresholdDrag = dist2 >= r.touchTapThreshold2;
}

// context swipe cancelling
if( capture && r.touchData.cxt ){
Expand Down Expand Up @@ -15385,6 +15400,8 @@ BRp.load = function() {

if( e.touches.length === 0 ){
r.touchData.dragDelta = [];
r.touchData.startPosition = null;
r.touchData.startGPosition = null;
}

if( updateStartStyle && start ){
Expand Down Expand Up @@ -18853,7 +18870,7 @@ var cytoscape = function( options ){ // jshint ignore:line
};

// replaced by build system
cytoscape.version = '2.6.8';
cytoscape.version = '2.6.9';

// try to register w/ jquery
if( window && window.jQuery ){
Expand Down
2 changes: 1 addition & 1 deletion dist/cytoscape.js.map
View file

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions dist/cytoscape.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/cytoscape.min.js.map
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": "2.6.8",
"version": "2.6.9",

"fnArgLinks": {
"selector": "#selectors",
Expand Down
10 changes: 1 addition & 9 deletions documentation/download/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,7 @@

<div class="build-list">

<div class="build"> <a href="cytoscape.js-2.6.8.zip"><span class="icon-download-alt"></span> cytoscape.js-2.6.8.zip</a> </div>

<div class="build"> <a href="cytoscape.js-2.6.7.zip"><span class="icon-download-alt"></span> cytoscape.js-2.6.7.zip</a> </div>

<div class="build"> <a href="cytoscape.js-2.6.6.zip"><span class="icon-download-alt"></span> cytoscape.js-2.6.6.zip</a> </div>

<div class="build"> <a href="cytoscape.js-2.6.5.zip"><span class="icon-download-alt"></span> cytoscape.js-2.6.5.zip</a> </div>

<div class="build"> <a href="cytoscape.js-2.6.4.zip"><span class="icon-download-alt"></span> cytoscape.js-2.6.4.zip</a> </div>
<div class="build"> <a href="cytoscape.js-2.6.9.zip"><span class="icon-download-alt"></span> cytoscape.js-2.6.9.zip</a> </div>

</div>

Expand Down
8 changes: 6 additions & 2 deletions documentation/index.html
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions documentation/js/all.min.js
View file

Large diffs are not rendered by default.

63 changes: 40 additions & 23 deletions documentation/js/cytoscape.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13906,12 +13906,14 @@ BRp.load = function() {
r.hoverData.which = e.which;

var cy = r.cy;
var pos = r.projectIntoViewport(e.clientX, e.clientY);
var gpos = [ e.clientX, e.clientY ];
var pos = r.projectIntoViewport( gpos[0], gpos[1] );
var select = r.selection;
var near = r.findNearestElement(pos[0], pos[1], true, false);
var draggedElements = r.dragData.possibleDragElements;

r.hoverData.mdownPos = pos;
r.hoverData.mdownGPos = gpos;

var checkForTaphold = function(){
r.hoverData.tapholdCancelled = false;
Expand Down Expand Up @@ -14080,7 +14082,10 @@ BRp.load = function() {

var cy = r.cy;
var zoom = cy.zoom();
var pos = r.projectIntoViewport(e.clientX, e.clientY);
var gpos = [ e.clientX, e.clientY ];
var pos = r.projectIntoViewport( gpos[0], gpos[1] );
var mdownPos = r.hoverData.mdownPos;
var mdownGPos = r.hoverData.mdownGPos;
var select = r.selection;

var near = null;
Expand All @@ -14094,16 +14099,19 @@ BRp.load = function() {

var draggedElements = r.dragData.possibleDragElements;

var dx = select[2] - select[0];
var dx2 = dx * dx;
var dy = select[3] - select[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;
var rdist2 = dist2 * zoom * zoom;
var isOverThresholdDrag;

var multSelKeyDown = isMultSelKeyDown( e );
if( mdownGPos ){
var dx = gpos[0] - mdownGPos[0];
var dx2 = dx * dx;
var dy = gpos[1] - mdownGPos[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;

var isOverThresholdDrag = rdist2 >= r.desktopTapThreshold2;
isOverThresholdDrag = dist2 >= r.desktopTapThreshold2;
}

var multSelKeyDown = isMultSelKeyDown( e );

if (isOverThresholdDrag) {
r.hoverData.tapholdCancelled = true;
Expand Down Expand Up @@ -14497,6 +14505,8 @@ BRp.load = function() {
r.dragData.didDrag = false;
r.hoverData.dragged = false;
r.hoverData.dragDelta = [];
r.hoverData.mdownPos = null;
r.hoverData.mdownGPos = null;

}, false);

Expand Down Expand Up @@ -14611,7 +14621,6 @@ BRp.load = function() {
if (e.touches[1]) { var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY); now[2] = pos[0]; now[3] = pos[1]; }
if (e.touches[2]) { var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY); now[4] = pos[0]; now[5] = pos[1]; }


// record starting points for pinch-to-zoom
if( e.touches[1] ){

Expand Down Expand Up @@ -14760,11 +14769,14 @@ BRp.load = function() {
// Tap, taphold
// -----

r.touchData.startPosition = [];
for (var i=0; i<now.length; i++) {
earlier[i] = now[i];
r.touchData.startPosition[i] = now[i];
}

r.touchData.startGPosition = [ e.touches[0].clientX, e.touches[0].clientY ];

r.touchData.singleTouchMoved = false;
r.touchData.singleTouchStartTime = +new Date();

Expand All @@ -14791,27 +14803,30 @@ BRp.load = function() {

var touchmoveHandler;
r.registerBinding(window, 'touchmove', touchmoveHandler = function(e) {

var select = r.selection;
var capture = r.touchData.capture;
var cy = r.cy;
var now = r.touchData.now; var earlier = r.touchData.earlier;
var now = r.touchData.now;
var earlier = r.touchData.earlier;
var zoom = cy.zoom();

if (e.touches[0]) { var pos = r.projectIntoViewport(e.touches[0].clientX, e.touches[0].clientY); now[0] = pos[0]; now[1] = pos[1]; }
if (e.touches[1]) { var pos = r.projectIntoViewport(e.touches[1].clientX, e.touches[1].clientY); now[2] = pos[0]; now[3] = pos[1]; }
if (e.touches[2]) { var pos = r.projectIntoViewport(e.touches[2].clientX, e.touches[2].clientY); now[4] = pos[0]; now[5] = pos[1]; }

var disp = []; for (var j=0;j<now.length;j++) { disp[j] = now[j] - earlier[j]; }
var startPos = r.touchData.startPosition;
var dx = now[0] - startPos[0];
var dx2 = dx * dx;
var dy = now[1] - startPos[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;
var rdist2 = dist2 * zoom * zoom;
var isOverThresholdDrag;

var isOverThresholdDrag = rdist2 >= r.touchTapThreshold2;
if( capture && e.touches[0] ){
var disp = []; for (var j=0;j<now.length;j++) { disp[j] = now[j] - earlier[j]; }
var startGPos = r.touchData.startGPosition;
var dx = e.touches[0].clientX - startGPos[0];
var dx2 = dx * dx;
var dy = e.touches[0].clientY - startGPos[1];
var dy2 = dy * dy;
var dist2 = dx2 + dy2;

isOverThresholdDrag = dist2 >= r.touchTapThreshold2;
}

// context swipe cancelling
if( capture && r.touchData.cxt ){
Expand Down Expand Up @@ -15385,6 +15400,8 @@ BRp.load = function() {

if( e.touches.length === 0 ){
r.touchData.dragDelta = [];
r.touchData.startPosition = null;
r.touchData.startGPosition = null;
}

if( updateStartStyle && start ){
Expand Down Expand Up @@ -18853,7 +18870,7 @@ var cytoscape = function( options ){ // jshint ignore:line
};

// replaced by build system
cytoscape.version = '2.6.8';
cytoscape.version = '2.6.9';

// try to register w/ jquery
if( window && window.jQuery ){
Expand Down
18 changes: 9 additions & 9 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": "2.6.8",
"version": "2.6.9",
"license": "MIT",
"description": "Graph theory (a.k.a. network) library for analysis and visualisation",
"homepage": "http://js.cytoscape.org",
Expand Down

0 comments on commit 4cb9d81

Please sign in to comment.