Commit Graph

109 Commits

Author SHA1 Message Date
tdhsmith
9eb89a03cf License mistake
Project standard doesn't seem to list all contributors in the license, so removed myself
2014-02-04 18:29:39 -06:00
tdhsmith
96f889ca41 Added basic functionality for image nodes
Extended the drawNode function to include basic image drawing. Adjusted the height and width functions to accommodate natural image dimensions as well as those set with node.data.image.width etc.
2014-02-04 18:19:33 -06:00
Dennis Hotson
98369ebcb9 Consistent version number bump 2014-01-11 06:12:42 +11:00
Dennis Hotson
fae78f1055 Bump version to 2.2.1 2014-01-11 05:27:19 +11:00
Dennis Hotson
36a98b03cd Font size bug fix 2014-01-11 05:26:23 +11:00
Dennis Hotson
e2e24d0601 Bump version to 2.2.0 2014-01-11 05:18:43 +11:00
Dennis Hotson
00cbc7f64e Improved calculation of text angle and spacing 2014-01-11 05:17:41 +11:00
Dennis Hotson
36c885871e Merge remote-tracking branch 'oak-tree/master'
* oak-tree/master:
  set label of edge at the angle of this edge.
2014-01-11 04:40:40 +11:00
Dennis Hotson
4ed5f13302 Whitespace fixes 2014-01-11 04:12:30 +11:00
Dennis Hotson
c7f7d040ec Bumped version 2014-01-11 04:10:39 +11:00
Dennis Hotson
cec178680f Switch order of onRenderStop and onRenderStart to preserve backwards compat 2014-01-11 04:10:34 +11:00
Dennis Hotson
ac17d28337 Merge remote-tracking branch 'fabiankessler/master'
* fabiankessler/master:
  Render start and stop callbacks for all cases.
  Documented that start() is silently ignored if running.
  added done callback to renderer start method.
  updated copyright year
2014-01-11 03:58:56 +11:00
cp123127
1b85a2e9b8 Fixed bug that causes inconsistant behavior for highlighting selected nodes. 2014-01-11 03:48:17 +11:00
Dennis Hotson
bcd9efd220 Whitespace fix 2014-01-11 03:45:40 +11:00
Dennis Hotson
a1f848d8d3 Merge pull request #44 from mikeleber/patch-1
Update springyui.js
2014-01-10 08:42:59 -08:00
oak-tree
4acb7e9fb7 set label of edge at the angle of this edge.
moreover, if two vertices have more than 1 edge allow each edge to have its own label. make sure each labels does not interfere each other.
2014-01-08 21:04:52 +02:00
Dennis Hotson
8be075d656 Add springy to bower 2013-08-23 19:39:38 +10:00
mikeleber
4adb4308dd Update springyui.js
font property for nodes and edges
graph.newEdge(AHM_10, AHM_50 ,{font:'10px Verdana, sans-serif', label: 'ablehnen', color: '#97f23d'});
2013-05-30 11:43:54 +02:00
Fabian Kessler
81213595ed Render start and stop callbacks for all cases.
Rendering can happen on demand (by calling start()) but also when adding/removing nodes and relations. I also need to be informed when rendering starts in my use case. I have a re-arrange button that needs to be toggled whenever rendering is in progress, and with these events it's nice and clean.
When the event callbacks are passed in to the Springy.Renderer start() method only (as in my previous commit) then all the other cases are left out (adding/removing nodes/relations).
2013-04-21 02:57:18 +03:00
Fabian Kessler
ffca60dcab Documented that start() is silently ignored if running. 2013-04-20 23:48:58 +03:00
Fabian Kessler
1b20da23e2 added done callback to renderer start method.
The done callback existed in the ForceDirected layout start method, but no one passed that in. Maybe I don't understand how it's meant to be used? Or something was lost on the way with refactorings in springy? Anyway, with this change it's possible to call the Springy.Renderer start() method with a done callback. Please accept it, or document how it's meant to be used. Thanks ;-)
2013-04-20 23:43:28 +03:00
Fabian Kessler
143d2d4c41 updated copyright year
The 2010 made me think that the project was abandoned. Also, arbor.js writes that it's based on springy. Only now that I take a closer look I see that there are recent commits.
2013-04-20 23:38:12 +03:00
Dennis Hotson
5439db1423 Added npm package.json 2013-03-27 01:19:47 +00:00
Dennis Hotson
43f725e61a Accidental global functions 2013-03-19 21:41:01 +11:00
Dennis Hotson
5ed407c69d Clean up adjacency table when edges are deleted 2013-03-15 11:19:47 +00:00
Dennis Hotson
80108b0f31 Merge branch 'namespace'
* namespace:
  Replace references to `window` with `root`
  Updated README with namespace
  Bump the major version number
  Added a top level Springy namespace
2013-03-15 11:11:11 +00:00
Dennis Hotson
43cae6cf02 Replace references to window with root 2013-03-15 10:56:22 +00:00
Dennis Hotson
a1d7eb6f18 Updated README with namespace 2013-03-15 10:54:36 +00:00
Dennis Hotson
8dfad90768 Bump the major version number 2013-03-14 13:32:20 +00:00
Dennis Hotson
484ec319df Added a top level Springy namespace 2013-03-14 13:30:14 +00:00
Dennis Hotson
9e4b8b0896 Fixed whitespace 2013-03-14 12:42:18 +00:00
Dennis Hotson
3df408fcc1 Basic double click handler 2013-03-14 22:26:28 +11:00
Dennis Hotson
4c0a9e3e28 Added method to stop layout calculations 2013-03-14 21:53:03 +11:00
Dennis Hotson
459904b833 Merge pull request #32 from techtonik/master
Add support for parsing JSON supplied as text
2013-03-12 14:15:47 -07:00
anatoly techtonik
ba7663ff2f Parse string passed to loadJSON. 2013-03-12 18:19:55 +03:00
anatoly techtonik
38ff681f1b README: remove demo word repetition from demo section 2013-03-12 18:05:58 +03:00
anatoly techtonik
32ceb118af Valid JSON doesn't support single quoted strings. 2013-03-12 17:33:42 +03:00
anatoly techtonik
64db6c14bc demo-json.html: Separate code from data 2013-03-12 16:38:12 +03:00
anatoly techtonik
1e6b1ad035 Merge remote-tracking branch 'techtonik/master'
* techtonik/master:
  Revert mixed argument patch for addNode(), because addNodes() in loadJSON already supports single string argument.
  Add JSON load capabilities to Springy.
  API change: addNode() now accepts string or Node
  Make demo2.html output different from demo.html
2013-03-12 12:48:11 +00:00
anatoly techtonik
adebe2dab0 Revert mixed argument patch for addNode(), because
addNodes() in loadJSON already supports single string
argument.
2013-03-12 15:16:45 +03:00
anatoly techtonik
1b93bd7dc7 Add JSON load capabilities to Springy. 2013-03-12 14:31:14 +03:00
anatoly techtonik
6c04b2416f API change: addNode() now accepts string or Node 2013-03-12 13:40:59 +03:00
anatoly techtonik
d3e7db95df Make demo2.html output different from demo.html 2013-03-12 13:10:39 +03:00
Dennis Hotson
7c39106546 Merge pull request #30 from techtonik/master
Enable strict mode for Springy.js
2013-03-12 02:54:11 -07:00
anatoly techtonik
947fc903fa Enable strict mode and fix two scope errors 2013-03-12 12:30:52 +03:00
Dennis Hotson
77dfdb9e1d Merge pull request #28 from techtonik/master
Simplified API for adding nodes and edges.
2013-02-05 15:12:46 -08:00
anatoly techtonik
e38e2202db Simplified API for adding edges. 2013-02-06 01:15:34 +03:00
anatoly techtonik
9ac764d634 Simplify addNodes() even more by using variable number of arguments. 2013-02-06 00:22:18 +03:00
anatoly techtonik
90b23f131e Add helper method .addNodes() that accepts list of strings. 2013-02-05 22:36:01 +03:00
anatoly techtonik
bc1e1a13a3 Use in operator to check for index existance.
The check (key in obj) is more readable than
(typeof key[obj] !== 'undefined').
2013-02-05 22:31:39 +03:00