Skip to content

Commit

Permalink
Update and clean dependencies
Browse files Browse the repository at this point in the history
Closes #34
  • Loading branch information
dignifiedquire committed Sep 22, 2015
1 parent a517486 commit 2c551e7
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 19 deletions.
4 changes: 2 additions & 2 deletions app/controls/open-browser.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var ipc = require('ipc')
var apiAddrToUrl = require('./utils').apiAddrToUrl
var init = require('./../init')
var open = require('open')
var shell = require('shell')

ipc.on('open-browser', openBrowser)

Expand All @@ -12,7 +12,7 @@ function openBrowser (cb) {
return console.error(err)
}

open(apiAddrToUrl(res.Value))
shell.openExternal(apiAddrToUrl(res.Value))
})
} else {
// TODO error should be emited to a error panel
Expand Down
4 changes: 2 additions & 2 deletions app/js/components/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default class Menu extends React.Component {
}

_getScreen () {
switch (this.state.status) {
switch (this.state.status) {
case RUNNING:
return (
<ProfileScreen
Expand All @@ -108,7 +108,7 @@ export default class Menu extends React.Component {

render () {
return (
<CSSTransitionGroup transitionName="fade">
<CSSTransitionGroup transitionName='fade'>
{this._getScreen()}
</CSSTransitionGroup>
)
Expand Down
3 changes: 1 addition & 2 deletions app/js/settings.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var React = require('react/addons')
var $ = require('jquery')

var Settings = React.createClass({

Expand Down Expand Up @@ -35,6 +34,6 @@ var Settings = React.createClass({
}
})

$(document).ready(function () {
document.addEventListener('DOMContentLoaded', () => {
React.render(<Settings />, document.getElementById('settings'))
})
3 changes: 1 addition & 2 deletions app/js/welcome.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
var React = require('react/addons')
var $ = require('jquery')
var ipc = window.require('remote').require('ipc')

var Initform = React.createClass({
Expand Down Expand Up @@ -144,6 +143,6 @@ var Initform = React.createClass({
}
})

$(document).ready(function () {
document.addEventListener('DOMContentLoaded', () => {
React.render(<Initform />, document.getElementById('welcome'))
})
20 changes: 9 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,15 @@
"electron-safe-ipc": "^0.6.1",
"ipfs-api": "^2.1.5",
"ipfs-logo": "0.1.3",
"ipfsd-ctl": "0.3.3",
"jquery": "^2.1.4",
"ipfsd-ctl": "0.5.0",
"jsxstyle": "0.0.17",
"lodash": "3.9.3",
"lodash": "^3.10.1",
"menubar": "^2.1.1",
"minimist": "1.1.1",
"multiaddr": "0.1.2",
"minimist": "^1.2.0",
"multiaddr": "1.0.0",
"normalize.css": "^3.0.3",
"open": "0.0.5",
"react": "0.13.3",
"react-toggle": "^1.2.3",
"silence-chromium": "2.0.0"
},
"devDependencies": {
Expand All @@ -32,7 +30,7 @@
"css-loader": "^0.18.0",
"electron-debug": "^0.2.1",
"electron-packager": "5.1.0",
"electron-prebuilt": "0.33.0",
"electron-prebuilt": "^0.33.0",
"eslint": "^1.5.0",
"eslint-config-standard": "^4.4.0",
"eslint-config-standard-react": "^1.1.0",
Expand All @@ -42,12 +40,12 @@
"file-loader": "^0.8.4",
"less": "^2.5.1",
"less-loader": "^2.2.1",
"pre-commit": "1.0.6",
"pre-commit": "^1.1.1",
"react-transform-catch-errors": "^1.0.0",
"react-transform-hmr": "^1.0.0",
"redbox-react": "^1.0.5",
"rimraf": "^2.3.4",
"shelljs": "0.4.0",
"rimraf": "^2.4.3",
"shelljs": "^0.5.3",
"standard": "^5.0.0",
"style-loader": "^0.12.4",
"webpack": "^1.12.2",
Expand All @@ -61,7 +59,7 @@
"build:babel": "./node_modules/.bin/babel app/config.js -o build/config.js && ./node_modules/.bin/babel app/controls -d build/controls && ./node_modules/.bin/babel app/init.js -o build/init.js",
"copy": "./copy.sh",
"build": "npm run clean && npm run build:webpack && npm run build:babel && npm run copy",
"electron": "node_modules/.bin/electron index.js",
"electron": "node_modules/.bin/electron index.js 2>&1 | silence-chromium",
"start": "npm run clean && npm run build:babel && ./node_modules/.bin/concurrent --kill-others \"node dev-server.js\" \"npm run electron\"",
"lint": "./node_modules/.bin/eslint .",
"dist": "npm run build && node pkg.js && npm run clean",
Expand Down

0 comments on commit 2c551e7

Please sign in to comment.