glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge commit '858ca66d69ed9e43f4d3a4ce6be288508cf4efa1' of github.com:metamaps/metamaps into window.resize.fix

Browse source
This commit is contained in:
Robert Best 2016-10-22 05:00:10 +00:00
parent ad1889dfc5 858ca66d69
commit 1cd7e22c40
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
frontend/src/Metamaps/Listeners.js
View file

@ -109,36 +109,36 @@ const Listeners = {
}) })
$(window).resize(function () { $(window).resize(function () {
if (Visualize && Visualize.mGraph){ if (Visualize && Visualize.mGraph) {
//Find the current canvas scale and map-coordinate at the centre of the user's screen // Find the current canvas scale and map-coordinate at the centre of the user's screen
var canvas = Visualize.mGraph.canvas, let canvas = Visualize.mGraph.canvas
scaleX = canvas.scaleOffsetX, const scaleX = canvas.scaleOffsetX
scaleY = canvas.scaleOffsetY, const scaleY = canvas.scaleOffsetY
centrePixX = canvas.canvases[0].size.width / 2, const centrePixX = canvas.canvases[0].size.width / 2
centrePixY = canvas.canvases[0].size.height / 2, const centrePixY = canvas.canvases[0].size.height / 2
centreCoords = Util.pixelsToCoords({x:centrePixX ,y:centrePixY}); const centreCoords = Util.pixelsToCoords({ x: centrePixX, y: centrePixY })
//Resize the canvas to fill the new window size. Based on how JIT works, this also resets the map back to scale 1 and tranlations = 0 // Resize the canvas to fill the new window size. Based on how JIT works, this also resets the map back to scale 1 and tranlations = 0
canvas.resize($(window).width(), $(window).height()) canvas.resize($(window).width(), $(window).height())
//Return the map to the original scale, and then put the previous central map-coordinate back to the centre of user's newly resized screen // Return the map to the original scale, and then put the previous central map-coordinate back to the centre of user's newly resized screen
canvas.scale(scaleX,scaleY); canvas.scale(scaleX, scaleY)
var newCentrePixX = canvas.canvases[0].size.width / 2, const newCentrePixX = canvas.canvases[0].size.width / 2
newCentrePixY = canvas.canvases[0].size.height / 2, const newCentrePixY = canvas.canvases[0].size.height / 2
newCentreCoords = Util.pixelsToCoords({x:newCentrePixX ,y:newCentrePixY}); const newCentreCoords = Util.pixelsToCoords({ x: newCentrePixX, y: newCentrePixY })
canvas.translate(newCentreCoords.x - centreCoords.x, newCentreCoords.y - centreCoords.y); canvas.translate(newCentreCoords.x - centreCoords.x, newCentreCoords.y - centreCoords.y)
} }
if (Active.Map && Realtime.inConversation) Realtime.positionVideos() if (Active.Map && Realtime.inConversation) Realtime.positionVideos()
Mobile.resizeTitle() Mobile.resizeTitle()
}) })
}, },
centerAndReveal: function(nodes, opts) { centerAndReveal: function (nodes, opts) {
if (nodes.length < 1) return if (nodes.length < 1) return
var node = nodes[nodes.length - 1] var node = nodes[nodes.length - 1]
if (opts.center && opts.reveal) { if (opts.center && opts.reveal) {
Topic.centerOn(node.id, function() { Topic.centerOn(node.id, function () {
Topic.fetchRelatives(nodes) Topic.fetchRelatives(nodes)
}) })
} else if (opts.center) { } else if (opts.center) {