diff --git a/src/ContainerDetailsSubheader.react.js b/src/ContainerDetailsSubheader.react.js index 98a5f6eb9b..163f7edc11 100644 --- a/src/ContainerDetailsSubheader.react.js +++ b/src/ContainerDetailsSubheader.react.js @@ -2,7 +2,6 @@ var _ = require('underscore'); var $ = require('jquery'); var React = require('react/addons'); var exec = require('exec'); -var path = require('path'); var metrics = require('./Metrics'); var ContainerStore = require('./ContainerStore'); var ContainerUtil = require('./ContainerUtil'); @@ -10,7 +9,7 @@ var machine = require('./DockerMachine'); var RetinaImage = require('react-retina-image'); var Router = require('react-router'); var webPorts = require('./Util').webPorts; -var util = require('./Util'); +var shell = require('shell'); var resources = require('./Resources'); var ContainerDetailsSubheader = React.createClass({ @@ -91,9 +90,7 @@ var ContainerDetailsSubheader = React.createClass({ metrics.track('Opened In Browser', { from: 'header' }); - util.openPathOrUrl(this.state.ports[this.state.defaultPort].url, function (err) { - if (err) { throw err; } - }); + shell.openExternal(this.state.ports[this.state.defaultPort].url); } }, handleRestart: function () { diff --git a/src/ContainerHome.react.js b/src/ContainerHome.react.js index d46c480c56..b8c74b6722 100644 --- a/src/ContainerHome.react.js +++ b/src/ContainerHome.react.js @@ -9,6 +9,7 @@ var ContainerHomeLogs = require('./ContainerHomeLogs.react'); var ContainerHomeFolders = require('./ContainerHomeFolders.react'); var ContainerUtil = require('./ContainerUtil'); var util = require('./Util'); +var shell = require('shell'); var resizeWindow = function () { $('.left .wrapper').height(window.innerHeight - 240); @@ -28,7 +29,7 @@ var ContainerHome = React.createClass({ resizeWindow(); }, handleErrorClick: function () { - util.openPathOrUrl('https://github.com/kitematic/kitematic/issues/new'); + shell.openExternal('https://github.com/kitematic/kitematic/issues/new'); }, componentWillReceiveProps: function () { this.init(); diff --git a/src/ContainerHomePreview.react.js b/src/ContainerHomePreview.react.js index 880462b129..b9efa4973d 100644 --- a/src/ContainerHomePreview.react.js +++ b/src/ContainerHomePreview.react.js @@ -59,9 +59,7 @@ var ContainerHomePreview = React.createClass({ metrics.track('Opened In Browser', { from: 'preview' }); - util.openPathOrUrl(this.state.ports[this.state.defaultPort].url, function (err) { - if (err) { throw err; } - }); + util.openExtenral(this.state.ports[this.state.defaultPort].url); } }, handleClickNotShowingCorrectly: function () { diff --git a/src/ContainerSettingsPorts.react.js b/src/ContainerSettingsPorts.react.js index fc9cf3b91b..1b5321bcd0 100644 --- a/src/ContainerSettingsPorts.react.js +++ b/src/ContainerSettingsPorts.react.js @@ -1,12 +1,11 @@ var _ = require('underscore'); var React = require('react/addons'); var Router = require('react-router'); -var exec = require('exec'); var ContainerStore = require('./ContainerStore'); var ContainerUtil = require('./ContainerUtil'); var metrics = require('./Metrics'); var webPorts = require('./Util').webPorts; -var util = require('./Util'); +var shell = require('shell'); var ContainerSettingsPorts = React.createClass({ mixins: [Router.State, Router.Navigation], @@ -39,9 +38,7 @@ var ContainerSettingsPorts = React.createClass({ metrics.track('Opened In Browser', { from: 'settings' }); - util.openPathOrUrl(url, function (err) { - if (err) { throw err; } - }); + shell.openExternal(url); }, handleChangeDefaultPort: function (port, e) { console.log(e.target.checked); diff --git a/src/ContainerSettingsVolumes.react.js b/src/ContainerSettingsVolumes.react.js index 0b6d2ad614..43616ac0f4 100644 --- a/src/ContainerSettingsVolumes.react.js +++ b/src/ContainerSettingsVolumes.react.js @@ -50,9 +50,7 @@ var ContainerSettingsVolumes = React.createClass({ metrics.track('Opened Volume Directory', { from: 'settings' }); - util.openPathOrUrl(path, function (err) { - if (err) { throw err; } - }); + util.showItemInFolder(path); }, render: function () { if (!this.props.container) { diff --git a/src/Containers.react.js b/src/Containers.react.js index e13a2def16..793731a961 100644 --- a/src/Containers.react.js +++ b/src/Containers.react.js @@ -12,7 +12,7 @@ var RetinaImage = require('react-retina-image'); var machine = require('./DockerMachine'); var OverlayTrigger = require('react-bootstrap').OverlayTrigger; var Tooltip = require('react-bootstrap').Tooltip; -var util = require('./Util'); +var shell = require('shell'); var Containers = React.createClass({ mixins: [Router.Navigation, Router.State], @@ -118,7 +118,7 @@ var Containers = React.createClass({ metrics.track('Opened Issue Reporter', { from: 'app' }); - util.openPathOrUrl('https://github.com/kitematic/kitematic/issues/new'); + shell.openExternal('https://github.com/kitematic/kitematic/issues/new'); }, handleMouseEnterDockerTerminal: function () { this.setState({ diff --git a/src/MenuTemplate.js b/src/MenuTemplate.js index 0c62b5a626..47ff1fb742 100644 --- a/src/MenuTemplate.js +++ b/src/MenuTemplate.js @@ -5,6 +5,7 @@ var util = require('./Util'); var metrics = require('./Metrics'); var machine = require('./DockerMachine'); var docker = require('./Docker'); +var shell = require('shell'); // main.js var MenuTemplate = function () { @@ -166,7 +167,7 @@ var MenuTemplate = function () { metrics.track('Opened Issue Reporter', { from: 'menu' }); - util.openPathOrUrl('https://github.com/kitematic/kitematic/issues/new'); + shell.openExternal('https://github.com/kitematic/kitematic/issues/new'); } } ] diff --git a/src/Util.js b/src/Util.js index 640f641a82..ddddfc3ed6 100644 --- a/src/Util.js +++ b/src/Util.js @@ -54,9 +54,6 @@ module.exports = { return (!fs.existsSync(path) || fs.statSync(path).gid !== 80 || fs.statSync(path).uid !== process.getuid()); } }, - openPathOrUrl(pathOrUrl, callback) { - open(pathOrUrl, callback); - }, supportDir() { var acc = path.join(this.home(), 'Library', 'Application\ Support', 'Kitematic'); fs.mkdirsSync(acc);