From 663706b1f7a59d3199f52ebe01845f23a9ac6add Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Wed, 22 Mar 2017 19:26:28 +0000 Subject: [PATCH] temp --- frontend/src/Metamaps/JIT.js | 19 ++++---------- frontend/src/Metamaps/Listeners.js | 13 +++------- frontend/src/Metamaps/Map/index.js | 35 +++++++++++++++++++++++++- frontend/src/Metamaps/index.js | 40 ------------------------------ 4 files changed, 42 insertions(+), 65 deletions(-) diff --git a/frontend/src/Metamaps/JIT.js b/frontend/src/Metamaps/JIT.js index ffaab923..6f953782 100644 --- a/frontend/src/Metamaps/JIT.js +++ b/frontend/src/Metamaps/JIT.js @@ -10,26 +10,16 @@ import $jit from '../patched/JIT' import MetacodeSelect from '../components/MetacodeSelect' -import Active from './Active' -import Control from './Control' -import Create from './Create' -import DataModel from './DataModel' -import Filter from './Filter' import GlobalUI, { ReactApp } from './GlobalUI' -import Map from './Map' -import Mouse from './Mouse' -import Selected from './Selected' import Settings from './Settings' -import Synapse from './Synapse' -import SynapseCard from './SynapseCard' -import Topic from './Topic' -import TopicCard from './Views/TopicCard' import Util from './Util' -import Visualize from './Visualize' let panningInt -const JIT = { +const JIT = ({ Active, Control, Create, DataModel, Filter, Map, Mouse, Selected, Synapse, + SynapseCard, Topic, TopicCard, Visualize }) => { + +return { tempInit: false, tempNode: null, tempNode2: null, @@ -1977,5 +1967,6 @@ const JIT = { } } } +} export default JIT diff --git a/frontend/src/Metamaps/Listeners.js b/frontend/src/Metamaps/Listeners.js index 352b5f7f..48fd0747 100644 --- a/frontend/src/Metamaps/Listeners.js +++ b/frontend/src/Metamaps/Listeners.js @@ -1,18 +1,10 @@ /* global $ */ -import Active from './Active' -import Create from './Create' -import Control from './Control' -import DataModel from './DataModel' -import JIT from './JIT' -import Realtime from './Realtime' -import Selected from './Selected' -import Topic from './Topic' import Util from './Util' -import Visualize from './Visualize' import { Search } from './GlobalUI' -const Listeners = { +const Listeners = ({ Active, Create, Control, DataModel, JIT, Realtime, Selected, Topic, Visualize }) => { +return { init: function() { var self = this $(document).on('keydown', function(e) { @@ -161,5 +153,6 @@ const Listeners = { } } } +} export default Listeners diff --git a/frontend/src/Metamaps/Map/index.js b/frontend/src/Metamaps/Map/index.js index 2db12263..1f0c8ac7 100644 --- a/frontend/src/Metamaps/Map/index.js +++ b/frontend/src/Metamaps/Map/index.js @@ -12,10 +12,13 @@ import DataModelMap from '../DataModel/Map' import Filter from '../Filter' import GlobalUI, { ReactApp } from '../GlobalUI' import JIT from '../JIT' +import Listeners from '../Listeners' import Loading from '../Loading' +import Organize from '../Organize' import Realtime from '../Realtime' import Selected from '../Selected' import SynapseCard from '../SynapseCard' +import Topic from '../Topic' import TopicCard from '../Views/TopicCard' import Visualize from '../Visualize' @@ -90,10 +93,40 @@ const Map = { }, launch: function(id) { const self = Map + + const newMap = { + Active: null, + AutoLayout: null, + Cable: null, + Control: null, + Create: null, + DataModel: null, + Filter: null, + Import: null, + JIT: null, + Listeners: null, + Loading: null, + Map: null, + Mouse: null, + Organize: null, + PasteInput: null, + Realtime: null, + Selected: null, + Settings: null, + Synapse: null, + SynapseCard: null, + Topic: null, + Views: null, + Visualize: null + } + newMap.JIT = JIT(newMap) + newMap.Listeners = Listeners(newMap) + console.log(newMap) + var dataIsReadySetupMap = function() { Map.setAccessRequest() Visualize.type = 'ForceDirected' - JIT.prepareVizData() + newMap.JIT.prepareVizData() Selected.reset() InfoBox.load() Filter.reset() diff --git a/frontend/src/Metamaps/index.js b/frontend/src/Metamaps/index.js index 12fcbe60..9804133e 100644 --- a/frontend/src/Metamaps/index.js +++ b/frontend/src/Metamaps/index.js @@ -1,72 +1,32 @@ import Account from './Account' import Active from './Active' import Admin from './Admin' -import AutoLayout from './AutoLayout' -import Cable from './Cable' -import Control from './Control' -import Create from './Create' -import DataModel from './DataModel' import Debug from './Debug' -import Filter from './Filter' import GlobalUI, { ReactApp, Search, CreateMap, ImportDialog } from './GlobalUI' import Import from './Import' -import JIT from './JIT' -import Listeners from './Listeners' import Loading from './Loading' -import Map, { CheatSheet, InfoBox } from './Map' import Mapper from './Mapper' -import Mouse from './Mouse' -import Organize from './Organize' -import PasteInput from './PasteInput' -import Realtime from './Realtime' -import Selected from './Selected' -import Settings from './Settings' -import Synapse from './Synapse' -import SynapseCard from './SynapseCard' import Topic from './Topic' import Util from './Util' -import Views from './Views' -import Visualize from './Visualize' const Metamaps = window.Metamaps || {} Metamaps.Account = Account Metamaps.Active = Active Metamaps.Admin = Admin -Metamaps.AutoLayout = AutoLayout -Metamaps.Cable = Cable -Metamaps.Control = Control -Metamaps.Create = Create -Metamaps.DataModel = DataModel Metamaps.Debug = Debug -Metamaps.Filter = Filter Metamaps.GlobalUI = GlobalUI Metamaps.GlobalUI.ReactApp = ReactApp Metamaps.GlobalUI.Search = Search Metamaps.GlobalUI.CreateMap = CreateMap Metamaps.GlobalUI.ImportDialog = ImportDialog Metamaps.Import = Import -Metamaps.JIT = JIT -Metamaps.Listeners = Listeners Metamaps.Loading = Loading -Metamaps.Map = Map -Metamaps.Map.CheatSheet = CheatSheet -Metamaps.Map.InfoBox = InfoBox Metamaps.Maps = {} Metamaps.Mapper = Mapper -Metamaps.Mouse = Mouse -Metamaps.Organize = Organize -Metamaps.PasteInput = PasteInput -Metamaps.Realtime = Realtime -Metamaps.Selected = Selected -Metamaps.Settings = Settings -Metamaps.Synapse = Synapse -Metamaps.SynapseCard = SynapseCard Metamaps.Topic = Topic Metamaps.Util = Util -Metamaps.Views = Views -Metamaps.Visualize = Visualize document.addEventListener('DOMContentLoaded', function() { // initialize all the modules