Change open dependency to atom-shell shell module

This commit is contained in:
Jeffrey Morgan 2015-04-17 10:15:42 -04:00
parent 149ab1fc85
commit d26b8a16fe
8 changed files with 12 additions and 23 deletions

View File

@ -2,7 +2,6 @@ var _ = require('underscore');
var $ = require('jquery'); var $ = require('jquery');
var React = require('react/addons'); var React = require('react/addons');
var exec = require('exec'); var exec = require('exec');
var path = require('path');
var metrics = require('./Metrics'); var metrics = require('./Metrics');
var ContainerStore = require('./ContainerStore'); var ContainerStore = require('./ContainerStore');
var ContainerUtil = require('./ContainerUtil'); var ContainerUtil = require('./ContainerUtil');
@ -10,7 +9,7 @@ var machine = require('./DockerMachine');
var RetinaImage = require('react-retina-image'); var RetinaImage = require('react-retina-image');
var Router = require('react-router'); var Router = require('react-router');
var webPorts = require('./Util').webPorts; var webPorts = require('./Util').webPorts;
var util = require('./Util'); var shell = require('shell');
var resources = require('./Resources'); var resources = require('./Resources');
var ContainerDetailsSubheader = React.createClass({ var ContainerDetailsSubheader = React.createClass({
@ -91,9 +90,7 @@ var ContainerDetailsSubheader = React.createClass({
metrics.track('Opened In Browser', { metrics.track('Opened In Browser', {
from: 'header' from: 'header'
}); });
util.openPathOrUrl(this.state.ports[this.state.defaultPort].url, function (err) { shell.openExternal(this.state.ports[this.state.defaultPort].url);
if (err) { throw err; }
});
} }
}, },
handleRestart: function () { handleRestart: function () {

View File

@ -9,6 +9,7 @@ var ContainerHomeLogs = require('./ContainerHomeLogs.react');
var ContainerHomeFolders = require('./ContainerHomeFolders.react'); var ContainerHomeFolders = require('./ContainerHomeFolders.react');
var ContainerUtil = require('./ContainerUtil'); var ContainerUtil = require('./ContainerUtil');
var util = require('./Util'); var util = require('./Util');
var shell = require('shell');
var resizeWindow = function () { var resizeWindow = function () {
$('.left .wrapper').height(window.innerHeight - 240); $('.left .wrapper').height(window.innerHeight - 240);
@ -28,7 +29,7 @@ var ContainerHome = React.createClass({
resizeWindow(); resizeWindow();
}, },
handleErrorClick: function () { handleErrorClick: function () {
util.openPathOrUrl('https://github.com/kitematic/kitematic/issues/new'); shell.openExternal('https://github.com/kitematic/kitematic/issues/new');
}, },
componentWillReceiveProps: function () { componentWillReceiveProps: function () {
this.init(); this.init();

View File

@ -59,9 +59,7 @@ var ContainerHomePreview = React.createClass({
metrics.track('Opened In Browser', { metrics.track('Opened In Browser', {
from: 'preview' from: 'preview'
}); });
util.openPathOrUrl(this.state.ports[this.state.defaultPort].url, function (err) { util.openExtenral(this.state.ports[this.state.defaultPort].url);
if (err) { throw err; }
});
} }
}, },
handleClickNotShowingCorrectly: function () { handleClickNotShowingCorrectly: function () {

View File

@ -1,12 +1,11 @@
var _ = require('underscore'); var _ = require('underscore');
var React = require('react/addons'); var React = require('react/addons');
var Router = require('react-router'); var Router = require('react-router');
var exec = require('exec');
var ContainerStore = require('./ContainerStore'); var ContainerStore = require('./ContainerStore');
var ContainerUtil = require('./ContainerUtil'); var ContainerUtil = require('./ContainerUtil');
var metrics = require('./Metrics'); var metrics = require('./Metrics');
var webPorts = require('./Util').webPorts; var webPorts = require('./Util').webPorts;
var util = require('./Util'); var shell = require('shell');
var ContainerSettingsPorts = React.createClass({ var ContainerSettingsPorts = React.createClass({
mixins: [Router.State, Router.Navigation], mixins: [Router.State, Router.Navigation],
@ -39,9 +38,7 @@ var ContainerSettingsPorts = React.createClass({
metrics.track('Opened In Browser', { metrics.track('Opened In Browser', {
from: 'settings' from: 'settings'
}); });
util.openPathOrUrl(url, function (err) { shell.openExternal(url);
if (err) { throw err; }
});
}, },
handleChangeDefaultPort: function (port, e) { handleChangeDefaultPort: function (port, e) {
console.log(e.target.checked); console.log(e.target.checked);

View File

@ -50,9 +50,7 @@ var ContainerSettingsVolumes = React.createClass({
metrics.track('Opened Volume Directory', { metrics.track('Opened Volume Directory', {
from: 'settings' from: 'settings'
}); });
util.openPathOrUrl(path, function (err) { util.showItemInFolder(path);
if (err) { throw err; }
});
}, },
render: function () { render: function () {
if (!this.props.container) { if (!this.props.container) {

View File

@ -12,7 +12,7 @@ var RetinaImage = require('react-retina-image');
var machine = require('./DockerMachine'); var machine = require('./DockerMachine');
var OverlayTrigger = require('react-bootstrap').OverlayTrigger; var OverlayTrigger = require('react-bootstrap').OverlayTrigger;
var Tooltip = require('react-bootstrap').Tooltip; var Tooltip = require('react-bootstrap').Tooltip;
var util = require('./Util'); var shell = require('shell');
var Containers = React.createClass({ var Containers = React.createClass({
mixins: [Router.Navigation, Router.State], mixins: [Router.Navigation, Router.State],
@ -118,7 +118,7 @@ var Containers = React.createClass({
metrics.track('Opened Issue Reporter', { metrics.track('Opened Issue Reporter', {
from: 'app' from: 'app'
}); });
util.openPathOrUrl('https://github.com/kitematic/kitematic/issues/new'); shell.openExternal('https://github.com/kitematic/kitematic/issues/new');
}, },
handleMouseEnterDockerTerminal: function () { handleMouseEnterDockerTerminal: function () {
this.setState({ this.setState({

View File

@ -5,6 +5,7 @@ var util = require('./Util');
var metrics = require('./Metrics'); var metrics = require('./Metrics');
var machine = require('./DockerMachine'); var machine = require('./DockerMachine');
var docker = require('./Docker'); var docker = require('./Docker');
var shell = require('shell');
// main.js // main.js
var MenuTemplate = function () { var MenuTemplate = function () {
@ -166,7 +167,7 @@ var MenuTemplate = function () {
metrics.track('Opened Issue Reporter', { metrics.track('Opened Issue Reporter', {
from: 'menu' from: 'menu'
}); });
util.openPathOrUrl('https://github.com/kitematic/kitematic/issues/new'); shell.openExternal('https://github.com/kitematic/kitematic/issues/new');
} }
} }
] ]

View File

@ -54,9 +54,6 @@ module.exports = {
return (!fs.existsSync(path) || fs.statSync(path).gid !== 80 || fs.statSync(path).uid !== process.getuid()); return (!fs.existsSync(path) || fs.statSync(path).gid !== 80 || fs.statSync(path).uid !== process.getuid());
} }
}, },
openPathOrUrl(pathOrUrl, callback) {
open(pathOrUrl, callback);
},
supportDir() { supportDir() {
var acc = path.join(this.home(), 'Library', 'Application\ Support', 'Kitematic'); var acc = path.join(this.home(), 'Library', 'Application\ Support', 'Kitematic');
fs.mkdirsSync(acc); fs.mkdirsSync(acc);