josdejong
|
e11f0c2b59
|
Fixed some more merge conflicts
|
10 years ago |
josdejong
|
a8a8519e4c
|
Merge branch 'alex_dev' into develop
Conflicts:
Jakefile.js
examples/graph/index.html
src/graph/Edge.js
src/graph/Graph.js
src/graph/graphMixins/ClusterMixin.js
src/graph/graphMixins/SelectionMixin.js
src/timeline/Controller.js
src/timeline/Range.js
src/timeline/Timeline.js
src/timeline/component/ItemSet.js
src/timeline/component/RootPanel.js
src/timeline/component/item/Item.js
src/util.js
|
10 years ago |
josdejong
|
d48fd1ed69
|
Fixed filename case errors
|
10 years ago |
josdejong
|
ad39a54d7d
|
Fixed filename case errors
|
10 years ago |
josdejong
|
81ac56c0e2
|
Merge remote-tracking branch 'origin/alex_dev' into alex_dev
Conflicts:
dist/vis.js
|
10 years ago |
josdejong
|
673f1aa2bb
|
Updated history
|
10 years ago |
Alex de Mulder
|
9d225542b9
|
finalized docs and zoom
|
10 years ago |
josdejong
|
a59b7f8d25
|
Implemented functions `setWindow` and `getWindow`
|
10 years ago |
josdejong
|
fd951bef92
|
Implemented ctrl+click and shift+click to select multiple items
|
10 years ago |
josdejong
|
d8444f3b0c
|
Documented callback functions onAdd, onUpdate, onMove, onRemove
|
10 years ago |
josdejong
|
4dc9fa6675
|
Added missing delete icon
|
10 years ago |
josdejong
|
819f1308b3
|
Added validation for callback functions. Some css fixes for range
|
10 years ago |
josdejong
|
dbd68d78cc
|
Fixed content overflow of ItemRange
|
10 years ago |
josdejong
|
19458b71b8
|
Fixed broken alignment of text in range
|
10 years ago |
josdejong
|
285257e6fc
|
neatly applying option editable everywhere
|
10 years ago |
josdejong
|
e3998b89d9
|
Implemented handlers onAdd, onUpdate, onMove, onRemove
|
10 years ago |
Alex de Mulder
|
2c6928d256
|
Tweaked physics system, added documentation for all new features (physics, manipulation, smooth) made all GUI elements CSS and HTML.
|
10 years ago |
Alex de Mulder
|
d3506a82b3
|
refactoring, altered data manipulation, added callbacks and triggers, inserted temporary function overloading
|
10 years ago |
Alex de Mulder
|
0bd417bdec
|
finalized smooth edges and force calculation
|
10 years ago |
Alex de Mulder
|
ba081895aa
|
Added smooth curve support to dashed lines (Only FIREFOX and CHROME!)
|
10 years ago |
Alex de Mulder
|
48b9499a3c
|
Added smooth curve support for center arrow and arrow.
|
10 years ago |
Alex de Mulder
|
15f0e10b39
|
minor tweaks
|
10 years ago |
Alex de Mulder
|
fc95490f8a
|
Finalized Barnes Hut force calculation, set it to default. Completed smooth curves. Added comments.
|
10 years ago |
josdejong
|
d712e32489
|
Implemented adding items
|
10 years ago |
josdejong
|
02d9f2f3be
|
Stop event propagation after deleting an item
|
10 years ago |
josdejong
|
9939679f9b
|
Renamed DataSet functions `subscribe` and `unsubscribe` to `on` and `off`
|
10 years ago |
josdejong
|
b5085d9703
|
Implemented snapping of items when dragging them
|
10 years ago |
Alex de Mulder
|
4b367b512c
|
added most of smooth curve system. Check example 16 for bug related to size.
|
10 years ago |
Alex de Mulder
|
4a08269699
|
mixin refactoring, added cluster normalization, tweaked forces, separated forces for repulsion and barnes hut
|
10 years ago |
Alex de Mulder
|
da444af45e
|
fixed BUG! barnes hut functional but slower than almende linear approx algorithm. Now to fix the naming of functions and explain code...
|
10 years ago |
Alex de Mulder
|
c34d9697b2
|
bughunt 4, going back commits
|
10 years ago |
Alex de Mulder
|
1e6bb102af
|
alter git
|
10 years ago |
Alex de Mulder
|
9c1e96a492
|
hunting bug...
|
10 years ago |
Alex de Mulder
|
45692d8681
|
Modified code structure, fixed barnes Hut bugs
|
10 years ago |
Alex de Mulder
|
2da8641aaa
|
failed experiment to use branes Hut with repulsionfields. reverting.
|
10 years ago |
Alex de Mulder
|
984f2efafb
|
Added Barnes-Hut force model. Main slowdown is in the drawing now..
|
10 years ago |
josdejong
|
6f7091fdec
|
Merge remote-tracking branch 'origin/develop' into develop
|
10 years ago |
josdejong
|
339d39ec3d
|
Dragging left and right side of a range almost working
|
10 years ago |
josdejong
|
797a138696
|
Timeline items can now be deleted
|
10 years ago |
josdejong
|
879385a4ca
|
Fixed selected ItemRangeOverflow not displaying as selected
|
10 years ago |
josdejong
|
6cd1e21714
|
Replaced Item.getWidth with a normal property, and ItemRangeOverflow makes a special property with getter/setter
|
10 years ago |
josdejong
|
e45c7505cc
|
Implemented options `selectable` and `editable`
|
10 years ago |
josdejong
|
57732eef35
|
Removed redundant events.js
|
10 years ago |
josdejong
|
b0366f9cbc
|
Replaced hom cooked event emitter with emitter-component module
|
10 years ago |
josdejong
|
ef3a52a274
|
Documented current time bar events
|
10 years ago |
josdejong
|
ca54afe295
|
Replaced mouse events with touch events for CustomTime
|
10 years ago |
josdejong
|
568ac65686
|
Consistently using Emitter instead of home-baked event emitter everywhere
|
10 years ago |
josdejong
|
439ec1b6d7
|
Extended Range with an Emitter mixin
|
10 years ago |
josdejong
|
3e5e1f162b
|
Changed request-reflow and request-repaint into events
|
10 years ago |
josdejong
|
2feb514a2a
|
Implemented dragging items
|
10 years ago |