From e4779c84739184d76e263f3b7bdd2e5fa553a756 Mon Sep 17 00:00:00 2001 From: Grandschtroumpf Date: Fri, 10 May 2019 08:59:16 +0200 Subject: [PATCH] fix browser issue --- src/app.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/app.js b/src/app.js index 23b1f349ac..e9cad6d3a2 100644 --- a/src/app.js +++ b/src/app.js @@ -334,11 +334,18 @@ Please make a backup of your contracts and start using http://remix.ethereum.org const themeModule = new ThemeModule(registry) registry.put({api: themeModule, name: 'themeModule'}) +<<<<<<< HEAD // ----------------- main view ---------------------- self._components.mainview = new MainView(appStore, appManager, mainPanelComponent) registry.put({ api: self._components.mainview, name: 'mainview' }) +======= + // ----------------- landing page ---------------------------- + // Need to have Home initialized before VerticalIconComponent render to access profile of it for icon + const landingPage = new LandingPage(appManager, appStore) + +>>>>>>> fix browser issue // ----------------- Vertical Icon ---------------------------- - const verticalIcons = new VerticalIcons('swapPanel', appStore) + const verticalIcons = new VerticalIcons('swapPanel', appStore, landingPage) registry.put({api: verticalIcons, name: 'verticalicon'}) const swapPanel = new SwapPanel(appStore) @@ -365,6 +372,7 @@ Please make a backup of your contracts and start using http://remix.ethereum.org pluginManagerComponent.setApp(appManager) pluginManagerComponent.setStore(appStore) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @@ -375,6 +383,8 @@ Please make a backup of your contracts and start using http://remix.ethereum.org const landingPage = new LandingPage(appManager, appStore) >>>>>>> Fix tests +======= +>>>>>>> fix browser issue self._components.editorpanel.init() >>>>>>> standard self._components.fileManager.init()