Skip to content

Upgrade jquery #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnrees wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade jquery #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cab4f85
updated raphael and fixed broken javascript links
johnrees Oct 13, 2016
01f1c65
use updated coordinates after node has been moved
johnrees Oct 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Examples/Alyn/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<html>
<head>
<title>Alyn</title>
<script language="Javascript" src="http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js"></script>
<script language="Javascript" src="../../raphael-1.5.2.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/raphael/2.2.6/raphael.min.js"></script>
<script language="Javascript" src="../../jsdatafloweditor.js"></script>
<script language="Javascript" src="alyn.js"></script>
</head>

<body>
<table style="border: 0px" border="1">
<tr><td id="audio-graph"></td></tr>
Expand Down
73 changes: 35 additions & 38 deletions jsdatafloweditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function event(onAdd, onRemove) {
evt.clear = function() {
hooks = [];
};

return evt;
};

Expand Down Expand Up @@ -127,16 +127,16 @@ var connecting = null;
var connectionCallback = null;

var defaultTheme = {
nodeFill: '#eee',
pointInactive: '#fff',
nodeFill: '#eee',
pointInactive: '#fff',
pointActive: '#ccc',
connectingFill: '#fff',
connectingStroke: '#000',
connectingStrokeWidth: '3',
lineFill: 'blue',
lineStroke: '#000',

connectingFill: '#fff',
connectingStroke: '#000',
connectingStrokeWidth: '3',

lineFill: 'blue',
lineStroke: '#000',
lineStrokeWidth: '3'
};

Expand All @@ -151,11 +151,11 @@ function graphEditor(id, width, height, theme) {
if(this.theme[k] == undefined)
this.theme[k] = defaultTheme[k];
}

this.raphael = Raphael(id, width, height);
this.nodes = [];
this.selected = null;

return true;
}

Expand All @@ -164,8 +164,8 @@ graphEditor.prototype.rigConnections = function(point) {
point.circle.mousedown(
function(e) {
(e.originalEvent || e).preventDefault();
var circle = sthis.raphael.circle(point.circle.attr('cx'), point.circle.attr('cy'), 1);

var circle = sthis.raphael.circle(e.offsetX, e.offsetY, 1);
if(!point.multi && point.connections.length != 0) {
var other = point.connections[0];
beginning = other.circle;
Expand All @@ -184,7 +184,7 @@ graphEditor.prototype.rigConnections = function(point) {
jo.unbind('mousemove', mousemove);
}
jo.mouseup(mouseup);

var sx = undefined, sy = undefined;
var mousemove = function(e) {
if(sx == undefined) {
Expand All @@ -197,7 +197,7 @@ graphEditor.prototype.rigConnections = function(point) {
sy = e.pageY;
}
jo.mousemove(mousemove);

connectionCallback = function(cpoint) {
if(cpoint.dir != connecting.dir && cpoint.parent != connecting.parent)
connecting.connect(sthis.raphael, cpoint);
Expand All @@ -207,7 +207,7 @@ graphEditor.prototype.rigConnections = function(point) {
point.circle.mouseup(
function(e) {
if(connecting == null) return;

connectionCallback(point);
}
);
Expand All @@ -216,7 +216,7 @@ graphEditor.prototype.rigConnections = function(point) {
graphEditor.prototype.addNode = function(x, y, node) {
var sthis = this;
this.nodes.push(node);

node.raphael = this.raphael;
node.parent = this;
node.focus.add(
Expand All @@ -234,7 +234,7 @@ graphEditor.prototype.addNode = function(x, y, node) {
this.element.attr('stroke-width', 1);
}
);

var temp = [];
ly = y+35;
mx = 0;
Expand Down Expand Up @@ -270,12 +270,12 @@ graphEditor.prototype.addNode = function(x, y, node) {
}
ly = y+35;
ex = lx + mx + 10;

var text = this.raphael.text(x+20, y+15, node.title).attr({fill: '#000', 'font-size': 16, 'font-weight': 'bold'}).xlateText();
bbox = text.getBBox();
if(ex < bbox.width + 80)
ex = bbox.width + 80;

for(i in labels) {
var label = labels[i];
label.point.circle = circle = this.raphael.circle(ex, ly, 7.5).attr({stroke: '#000', fill: this.theme.pointInactive}).toFront();
Expand All @@ -285,12 +285,12 @@ graphEditor.prototype.addNode = function(x, y, node) {
temp.push(circle);
temp.push(label);
}

rect = this.raphael.rect(x, y, ex+10 - x, Math.max(my, ly) - y, 10).attr({fill: this.theme.nodeFill, 'fill-opacity': 0.9});
var set = node.element = this.raphael.set().push(rect, text.toFront());
for(i in temp)
set.push(temp[i].toFront());

var suppressSelect = false;
rect.click(
function() {
Expand All @@ -304,7 +304,7 @@ graphEditor.prototype.addNode = function(x, y, node) {
node.focus();
}
);

function start() {
this.cx = this.cy = 0;
this.moved = false;
Expand All @@ -318,7 +318,6 @@ graphEditor.prototype.addNode = function(x, y, node) {
set.toFront();
for(i in node.points)
node.points[i].fixConnections(sthis.raphael);
sthis.raphael.safari();
}
function end() {
set.animate({'fill-opacity': 0.9}, 250);
Expand All @@ -332,7 +331,7 @@ function graphNode(id, title) {
this.id = id;
this.title = title;
this.points = [];

this.focus = event().add(function() {
this.selected = true;
});
Expand All @@ -352,7 +351,7 @@ function graphNode(id, title) {
this.points[i].remove(this.raphael);
});
this.selected = false;

return true;
}

Expand All @@ -370,10 +369,10 @@ function point(parent, label, dir, multi) {
this.multi = dir == 'out';
else
this.multi = multi;

this.connections = [];
this.lines = []

return true;
}

Expand All @@ -387,30 +386,29 @@ point.prototype.remove = function(raphael) {
point.prototype.connect = function(raphael, other, sub) {
var sthis = this;
var editor = this.parent.parent;

if(sub !== true) {
if(!this.multi && this.connections.length != 0)
return false;
else if(!other.multi && other.connections.length != 0)
return false;
}

this.connections.push(other);
this.circle.attr({fill: editor.theme.pointActive});
if(sub !== true) {
function remove() {
sthis.removeConnection(raphael, other);
raphael.safari();
}

other.connect(raphael, this, true);
line = raphael.connection(this.circle, other.circle, editor.theme.lineFill, editor.theme.lineStroke + '|' + editor.theme.lineStrokeWidth, remove);
this.lines.push(line);
other.lines.push(line);
}

this.parent.connect(this, other);

return true;
};

Expand All @@ -426,15 +424,14 @@ point.prototype.removeConnection = function(raphael, other, sub) {
this.lines.splice(i, 1);
break;
}

if(this.connections.length == 0)
this.circle.attr({fill: editor.theme.pointInactive});

this.parent.disconnect(this, other);
};

point.prototype.fixConnections = function(raphael) {
for(var i in this.lines)
raphael.connection(this.lines[i]);
raphael.safari();
};