Skip to content

Commit

Permalink
18.0.3 release
Browse files Browse the repository at this point in the history
  • Loading branch information
davidjgraph committed May 13, 2022
1 parent 0620baf commit ad77475
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 3 deletions.
5 changes: 5 additions & 0 deletions src/main/webapp/electron.js
Expand Up @@ -123,6 +123,11 @@ function createWindow (opt = {})
mainWindow.webContents.openDevTools()
}

ipcMain.on('openDevTools', function()
{
mainWindow.webContents.openDevTools();
});

mainWindow.on('maximize', function()
{
mainWindow.webContents.send('maximize')
Expand Down
31 changes: 28 additions & 3 deletions src/main/webapp/js/diagramly/ElectronApp.js
Expand Up @@ -620,6 +620,18 @@ mxStencilRegistry.allowEval = false;

editorUi.actions.addAction('plugins...', function()
{
var pluginsMap = {};
//Initialize it with plugins in settings
var plugins = (mxSettings.settings != null) ? mxSettings.getPlugins() : null;

if (plugins != null)
{
for (var i = 0; i < plugins.length; i++)
{
pluginsMap[plugins[i]] = true;
}
}

editorUi.showDialog(new PluginsDialog(editorUi, function(callback)
{
var div = document.createElement('div');
Expand All @@ -634,9 +646,13 @@ mxStencilRegistry.allowEval = false;

for (var i = 0; i < App.publicPlugin.length; i++)
{
var p = App.publicPlugin[i];

if (pluginsMap[App.pluginRegistry[p]]) continue;

var option = document.createElement('option');
mxUtils.write(option, App.publicPlugin[i]);
option.value = App.publicPlugin[i];
mxUtils.write(option, p);
option.value = p;
pluginsSelect.appendChild(option);
}

Expand Down Expand Up @@ -694,12 +710,16 @@ mxStencilRegistry.allowEval = false;

var dlg = new CustomDialog(editorUi, div, mxUtils.bind(this, function()
{
callback(App.pluginRegistry[pluginsSelect.value]);
var newP = App.pluginRegistry[pluginsSelect.value];
pluginsMap[newP] = true;
callback(newP);
}));
editorUi.showDialog(dlg.container, 300, 125, true, true);
},
async function(plugin)
{
delete pluginsMap[plugin];

await requestSync({
action: 'uninstallPlugin',
plugin: plugin
Expand Down Expand Up @@ -1755,6 +1775,11 @@ mxStencilRegistry.allowEval = false;
electron.sendMessage('toggleSpellCheck');
}

App.prototype.openDevTools = function()
{
electron.sendMessage('openDevTools');
}

var origUpdateHeader = App.prototype.updateHeader;

App.prototype.updateHeader = function()
Expand Down
10 changes: 10 additions & 0 deletions src/main/webapp/js/diagramly/Menus.js
Expand Up @@ -3833,6 +3833,11 @@

spellCheckAction.setToggleAction(true);
spellCheckAction.setSelectedCallback(function() { return enableSpellCheck; });

editorUi.actions.addAction('openDevTools', function()
{
editorUi.openDevTools();
});
}

this.put('extras', new Menu(mxUtils.bind(this, function(menu, parent)
Expand Down Expand Up @@ -3902,6 +3907,11 @@

this.addMenuItems(menu, ['configuration'], parent);

if (EditorUi.isElectronApp)
{
this.addMenuItems(menu, ['openDevTools'], parent);
}

// Adds trailing separator in case new plugin entries are added
menu.addSeparator(parent);

Expand Down

0 comments on commit ad77475

Please sign in to comment.