From d97b5c297729bb9420fac3ce61dd3659d78bd5a8 Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Thu, 22 Sep 2016 15:32:08 +0800 Subject: [PATCH] make Util modular --- frontend/src/Metamaps/Util.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/frontend/src/Metamaps/Util.js b/frontend/src/Metamaps/Util.js index e835a15b..9eb715de 100644 --- a/frontend/src/Metamaps/Util.js +++ b/frontend/src/Metamaps/Util.js @@ -1,11 +1,4 @@ -/* global Metamaps */ - -/* - * Metamaps.Util.js - * - * Dependencies: - * - Metamaps.Visualize - */ +import Visualize from './Visualize' const Util = { // helper function to determine how many lines are needed @@ -45,8 +38,8 @@ const Util = { return Math.sqrt(Math.pow((p2.x - p1.x), 2) + Math.pow((p2.y - p1.y), 2)) }, coordsToPixels: function (coords) { - if (Metamaps.Visualize.mGraph) { - var canvas = Metamaps.Visualize.mGraph.canvas, + if (Visualize.mGraph) { + var canvas = Visualize.mGraph.canvas, s = canvas.getSize(), p = canvas.getPos(), ox = canvas.translateOffsetX, @@ -67,8 +60,8 @@ const Util = { }, pixelsToCoords: function (pixels) { var coords - if (Metamaps.Visualize.mGraph) { - var canvas = Metamaps.Visualize.mGraph.canvas, + if (Visualize.mGraph) { + var canvas = Visualize.mGraph.canvas, s = canvas.getSize(), p = canvas.getPos(), ox = canvas.translateOffsetX,