From 8ed2b3ffc17d7206672853d0dedac7b8dacb64b2 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 22 Sep 2016 17:14:34 +0800
Subject: [PATCH] remove Constants.js
---
frontend/src/Metamaps/Constants.js | 56 ------------------------------
frontend/src/Metamaps/Mouse.js | 16 +++++++++
frontend/src/Metamaps/Selected.js | 11 ++++++
frontend/src/Metamaps/Settings.js | 21 +++++++++++
frontend/src/Metamaps/Visualize.js | 6 ++--
frontend/src/Metamaps/index.js | 9 +++--
6 files changed, 58 insertions(+), 61 deletions(-)
delete mode 100644 frontend/src/Metamaps/Constants.js
create mode 100644 frontend/src/Metamaps/Mouse.js
create mode 100644 frontend/src/Metamaps/Selected.js
create mode 100644 frontend/src/Metamaps/Settings.js
diff --git a/frontend/src/Metamaps/Constants.js b/frontend/src/Metamaps/Constants.js
deleted file mode 100644
index 9d0818ab..00000000
--- a/frontend/src/Metamaps/Constants.js
+++ /dev/null
@@ -1,56 +0,0 @@
-window.Metamaps = window.Metamaps || {}
-
-// TODO everything in this file should be moved into one of the other modules
-// Either as a local constant, or as a local constant with a globally available getter/setter
-
-Metamaps.Maps = Metamaps.Maps || {}
-
-Metamaps.Settings = {
- embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages
- sandbox: false, // puts the app into a mode (when true) where it only creates data locally, and isn't writing it to the database
- colors: {
- background: '#344A58',
- synapses: {
- normal: '#888888',
- hover: '#888888',
- selected: '#FFFFFF'
- },
- topics: {
- selected: '#FFFFFF'
- },
- labels: {
- background: '#18202E',
- text: '#DDD'
- }
- },
-}
-
-Metamaps.Touch = {
- touchPos: null, // this stores the x and y values of a current touch event
- touchDragNode: null // this stores a reference to a JIT node that is being dragged
-}
-
-Metamaps.Mouse = {
- didPan: false,
- didBoxZoom: false,
- changeInX: 0,
- changeInY: 0,
- edgeHoveringOver: false,
- boxStartCoordinates: false,
- boxEndCoordinates: false,
- synapseStartCoordinates: [],
- synapseEndCoordinates: null,
- lastNodeClick: 0,
- lastCanvasClick: 0,
- DOUBLE_CLICK_TOLERANCE: 300
-}
-
-Metamaps.Selected = {
- reset: function () {
- var self = Metamaps.Selected
- self.Nodes = []
- self.Edges = []
- },
- Nodes: [],
- Edges: []
-}
diff --git a/frontend/src/Metamaps/Mouse.js b/frontend/src/Metamaps/Mouse.js
new file mode 100644
index 00000000..9989bc20
--- /dev/null
+++ b/frontend/src/Metamaps/Mouse.js
@@ -0,0 +1,16 @@
+const Mouse = {
+ didPan: false,
+ didBoxZoom: false,
+ changeInX: 0,
+ changeInY: 0,
+ edgeHoveringOver: false,
+ boxStartCoordinates: false,
+ boxEndCoordinates: false,
+ synapseStartCoordinates: [],
+ synapseEndCoordinates: null,
+ lastNodeClick: 0,
+ lastCanvasClick: 0,
+ DOUBLE_CLICK_TOLERANCE: 300
+}
+
+export default Mouse
diff --git a/frontend/src/Metamaps/Selected.js b/frontend/src/Metamaps/Selected.js
new file mode 100644
index 00000000..396270ab
--- /dev/null
+++ b/frontend/src/Metamaps/Selected.js
@@ -0,0 +1,11 @@
+const Selected = {
+ reset: function () {
+ var self = Metamaps.Selected
+ self.Nodes = []
+ self.Edges = []
+ },
+ Nodes: [],
+ Edges: []
+}
+
+export default Selected
diff --git a/frontend/src/Metamaps/Settings.js b/frontend/src/Metamaps/Settings.js
new file mode 100644
index 00000000..687a6629
--- /dev/null
+++ b/frontend/src/Metamaps/Settings.js
@@ -0,0 +1,21 @@
+const Settings = {
+ embed: false, // indicates that the app is on a page that is optimized for embedding in iFrames on other web pages
+ sandbox: false, // puts the app into a mode (when true) where it only creates data locally, and isn't writing it to the database
+ colors: {
+ background: '#344A58',
+ synapses: {
+ normal: '#888888',
+ hover: '#888888',
+ selected: '#FFFFFF'
+ },
+ topics: {
+ selected: '#FFFFFF'
+ },
+ labels: {
+ background: '#18202E',
+ text: '#DDD'
+ }
+ },
+}
+
+export default Settings
diff --git a/frontend/src/Metamaps/Visualize.js b/frontend/src/Metamaps/Visualize.js
index 5e99519f..4aa65772 100644
--- a/frontend/src/Metamaps/Visualize.js
+++ b/frontend/src/Metamaps/Visualize.js
@@ -11,7 +11,6 @@
* - Metamaps.Synapses
* - Metamaps.TopicCard
* - Metamaps.Topics
- * - Metamaps.Touch
*/
const Visualize = {
@@ -19,6 +18,7 @@ const Visualize = {
cameraPosition: null, // stores the camera position when using a 3D visualization
type: 'ForceDirected', // the type of graph we're building, could be "RGraph", "ForceDirected", or "ForceDirected3D"
loadLater: false, // indicates whether there is JSON that should be loaded right in the offset, or whether to wait till the first topic is created
+ touchDragNode: null,
init: function () {
var self = Visualize
// disable awkward dragging of the canvas element that would sometimes happen
@@ -40,9 +40,9 @@ const Visualize = {
// prevent touch events on the canvas from default behaviour
$('#infovis-canvas').bind('touchend touchcancel', function (event) {
lastDist = 0
- if (!self.mGraph.events.touchMoved && !Metamaps.Touch.touchDragNode) Metamaps.TopicCard.hideCurrentCard()
+ if (!self.mGraph.events.touchMoved && !Visualize.touchDragNode) Metamaps.TopicCard.hideCurrentCard()
self.mGraph.events.touched = self.mGraph.events.touchMoved = false
- Metamaps.Touch.touchDragNode = false
+ Visualize.touchDragNode = false
})
},
computePositions: function () {
diff --git a/frontend/src/Metamaps/index.js b/frontend/src/Metamaps/index.js
index 598533c0..37e93492 100644
--- a/frontend/src/Metamaps/index.js
+++ b/frontend/src/Metamaps/index.js
@@ -1,7 +1,5 @@
/* global $ */
-import './Constants'
-
import Account from './Account'
import Active from './Active'
import Admin from './Admin'
@@ -18,10 +16,13 @@ import Listeners from './Listeners'
import Map from './Map'
import Mapper from './Mapper'
import Mobile from './Mobile'
+import Mouse from './Mouse'
import Organize from './Organize'
import PasteInput from './PasteInput'
import Realtime from './Realtime'
import Router from './Router'
+import Selected from './Selected'
+import Settings from './Settings'
import Synapse from './Synapse'
import SynapseCard from './SynapseCard'
import Topic from './Topic'
@@ -45,13 +46,17 @@ Metamaps.Import = Import
Metamaps.JIT = JIT
Metamaps.Listeners = Listeners
Metamaps.Map = Map
+Metamaps.Maps = {}
Metamaps.Mapper = Mapper
Metamaps.Mobile = Mobile
+Metamaps.Mouse = Mouse
Metamaps.Organize = Organize
Metamaps.PasteInput = PasteInput
Metamaps.Realtime = Realtime
Metamaps.ReactComponents = ReactComponents
Metamaps.Router = Router
+Metamaps.Selected = Selected
+Metamaps.Settings = Settings
Metamaps.Synapse = Synapse
Metamaps.SynapseCard = SynapseCard
Metamaps.Topic = Topic