Skip to content

Commit 7bb9bce

Browse files
author
hdngr
committed
hot fix for zooming and panning + bump version of alchemy used on site
1 parent 687af8f commit 7bb9bce

4 files changed

Lines changed: 7 additions & 5 deletions

File tree

app/scripts/alchemy/core/interactions.coffee.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
if not @_zoomBehavior?
8787
@_zoomBehavior = d3.behavior.zoom()
8888
@_zoomBehavior.scaleExtent extent
89-
.on "zoom", (d)->
89+
.on "zoom", (d) ->
9090
a = Alchemy::getInst this
9191
a.vis.attr("transform", "translate(#{ d3.event.translate })
9292
scale(#{ d3.event.scale })" )

app/scripts/alchemy/core/startGraph.coffee.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
.attr "pointer-events", "all"
4242
.attr "shape-rendering", "optimizeSpeed"
4343
.attr "style", "background:#{conf.backgroundColour};"
44-
.attr "alchInst", (d)-> Alchemy::instances.length
44+
.attr "alchInst", (d) -> Alchemy::instances.length - 1
4545
.on 'click', a.interactions.deselectAll
4646
.call a.interactions.zoom(conf.scaleExtent)
4747
.on "dblclick.zoom", null

app/scripts/alchemy/drawing/edgeUtils.coffee.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ for the curve of the node.
170170
Math.atan2(height, width) / Math.PI * 180
171171
172172
captionAngle: (angle) ->
173-
debugger
174173
if angle < -90 or angle > 90
175174
180
176175
else

site/bower.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"angular-route": "~1.2.0",
1515
"angular-bootstrap": "~0.11.0",
1616
"angular-inview": "~1.3.2",
17-
"alchemyjs": "~0.3.1",
17+
"alchemyjs": "0.4.0",
1818
"google-code-prettify": "~1.0.1",
1919
"modernizr": "~2.8.3",
2020
"font-awesome": "~4.2.0",
@@ -25,5 +25,8 @@
2525
"angular-scenario": "~1.2.0",
2626
"marked": "~0.3.2"
2727
},
28-
"appPath": "app"
28+
"appPath": "app",
29+
"resolutions": {
30+
"alchemyjs": "0.4.0"
31+
}
2932
}

0 commit comments

Comments
 (0)