diff --git a/app/src/electron.js b/app/src/electron.js index 9e2ab2956..1b676da0f 100644 --- a/app/src/electron.js +++ b/app/src/electron.js @@ -152,8 +152,7 @@ function buildMenu() { } ipcMain.on('update-menu', async (event, arg) => { - const commands = await mainWindow.webContents.executeJavaScript(`getCurrentTabCommands()`); - console.log('getCurrentTabCommands', commands); + const commands = await mainWindow.webContents.executeJavaScript(`dbgate_getCurrentTabCommands()`); mainMenu.getMenuItemById('save').enabled = !!commands.save; mainMenu.getMenuItemById('saveAs').enabled = !!commands.saveAs; }); diff --git a/packages/web/src/TabsPanel.js b/packages/web/src/TabsPanel.js index 60891ee2b..37c3e121d 100644 --- a/packages/web/src/TabsPanel.js +++ b/packages/web/src/TabsPanel.js @@ -225,7 +225,7 @@ export default function TabsPanel() { if (electron) { const { ipcRenderer } = electron; const activeTab = tabs.find(x => x.selected); - window['activeTabId'] = activeTab ? activeTab.tabid : null; + window['dbgate_activeTabId'] = activeTab ? activeTab.tabid : null; ipcRenderer.send('update-menu'); } }, [tabs]); diff --git a/packages/web/src/index.js b/packages/web/src/index.js index 29e524d25..6cb89510d 100644 --- a/packages/web/src/index.js +++ b/packages/web/src/index.js @@ -23,14 +23,14 @@ import localStorageGarbageCollector from './utility/localStorageGarbageCollector // import 'ace-builds/src-noconflict/snippets/mysql'; localStorageGarbageCollector(); -window['tabExports'] = {}; -window['getCurrentTabCommands'] = () => { - const tabid = window['activeTabId']; - return _.mapValues(window['tabExports'][tabid] || {}, v => !!v); +window['dbgate_tabExports'] = {}; +window['dbgate_getCurrentTabCommands'] = () => { + const tabid = window['dbgate_activeTabId']; + return _.mapValues(window['dbgate_tabExports'][tabid] || {}, v => !!v); }; window['dbgate_tabCommand'] = cmd => { - const tabid = window['activeTabId']; - const commands = window['tabExports'][tabid]; + const tabid = window['dbgate_activeTabId']; + const commands = window['dbgate_tabExports'][tabid]; const func = (commands || {})[cmd]; if (func) func(); }; diff --git a/packages/web/src/modals/SaveTabModal.js b/packages/web/src/modals/SaveTabModal.js index 34b4f0d91..c60b4a955 100644 --- a/packages/web/src/modals/SaveTabModal.js +++ b/packages/web/src/modals/SaveTabModal.js @@ -77,14 +77,14 @@ export default function SaveTabModal({ const electron = getElectron(); if (electron) { const { ipcRenderer } = electron; - window['tabExports'][tabid] = { + window['dbgate_tabExports'][tabid] = { save: handleSaveRef.current, saveAs: saveFileModalState.open, }; ipcRenderer.send('update-menu'); return () => { - delete window['tabExports'][tabid]; + delete window['dbgate_tabExports'][tabid]; ipcRenderer.send('update-menu'); }; }