|
|
@ -334,11 +334,18 @@ Please make a backup of your contracts and start using http://remix.ethereum.org |
|
|
|
const themeModule = new ThemeModule(registry) |
|
|
|
const themeModule = new ThemeModule(registry) |
|
|
|
registry.put({api: themeModule, name: 'themeModule'}) |
|
|
|
registry.put({api: themeModule, name: 'themeModule'}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
// ----------------- main view ----------------------
|
|
|
|
// ----------------- main view ----------------------
|
|
|
|
self._components.mainview = new MainView(appStore, appManager, mainPanelComponent) |
|
|
|
self._components.mainview = new MainView(appStore, appManager, mainPanelComponent) |
|
|
|
registry.put({ api: self._components.mainview, name: 'mainview' }) |
|
|
|
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 ----------------------------
|
|
|
|
// ----------------- Vertical Icon ----------------------------
|
|
|
|
const verticalIcons = new VerticalIcons('swapPanel', appStore) |
|
|
|
const verticalIcons = new VerticalIcons('swapPanel', appStore, landingPage) |
|
|
|
registry.put({api: verticalIcons, name: 'verticalicon'}) |
|
|
|
registry.put({api: verticalIcons, name: 'verticalicon'}) |
|
|
|
|
|
|
|
|
|
|
|
const swapPanel = new SwapPanel(appStore) |
|
|
|
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.setApp(appManager) |
|
|
|
pluginManagerComponent.setStore(appStore) |
|
|
|
pluginManagerComponent.setStore(appStore) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< HEAD |
|
|
|
<<<<<<< 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) |
|
|
|
const landingPage = new LandingPage(appManager, appStore) |
|
|
|
|
|
|
|
|
|
|
|
>>>>>>> Fix tests |
|
|
|
>>>>>>> Fix tests |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
>>>>>>> fix browser issue |
|
|
|
self._components.editorpanel.init() |
|
|
|
self._components.editorpanel.init() |
|
|
|
>>>>>>> standard |
|
|
|
>>>>>>> standard |
|
|
|
self._components.fileManager.init() |
|
|
|
self._components.fileManager.init() |
|
|
|