diff --git a/index.js b/index.js index 3956f970bd..58d006cf6c 100644 --- a/index.js +++ b/index.js @@ -127,7 +127,16 @@ app.on('ready', function() { } // Create the browser window. - mainWindow = new BrowserWindow({width: 800, height: 578, frame:false, resizable: false}); + var windowOptions = { + width: 800, + height: 578, + frame: false, + resizable: false, + 'web-preferences': { + 'web-security': false + } + }; + mainWindow = new BrowserWindow(windowOptions); // and load the index.html of the app. mainWindow.loadUrl(url); @@ -135,4 +144,3 @@ app.on('ready', function() { mainWindow.focus(); }); }); - diff --git a/meteor/client/lib/apputil.js b/meteor/client/lib/apputil.js index 12845487fc..058b0401f4 100644 --- a/meteor/client/lib/apputil.js +++ b/meteor/client/lib/apputil.js @@ -101,8 +101,8 @@ AppUtil.restart = function (appId) { AppUtil.remove = function (appId) { var app = Apps.findOne(appId); + Apps.remove({_id: appId}); if (app.docker) { - Apps.remove({_id: appId}); Docker.removeContainer(app.docker.Id, function (err) { if (err) { console.error(err); } var appPath = path.join(Util.KITE_PATH, app.name); diff --git a/meteor/client/views/dashboard/apps/dashboard-single-app.html b/meteor/client/views/dashboard/apps/dashboard-single-app.html index f9f86d0acf..baa2df2470 100755 --- a/meteor/client/views/dashboard/apps/dashboard-single-app.html +++ b/meteor/client/views/dashboard/apps/dashboard-single-app.html @@ -22,11 +22,7 @@ {{image.meta.name}}