Passage à electron 1.6.5
This commit is contained in:
@ -31,10 +31,7 @@ function select(state) {
|
||||
// Connect App to Redux store
|
||||
App = connect(select)(App);
|
||||
|
||||
ReactDOM.render(
|
||||
<Provider store={store}>
|
||||
<App />
|
||||
</Provider>
|
||||
,
|
||||
|
||||
ReactDOM.render(<Provider store={store}><App /></Provider>,
|
||||
document.getElementById('pitaya')
|
||||
);
|
||||
|
@ -2,7 +2,7 @@
|
||||
var React = require('react');
|
||||
var connect = require('react-redux').connect;
|
||||
var actions = require('../../store/actions');
|
||||
var dialog = require('remote').require('dialog');
|
||||
var dialog = require('electron').remote.dialog;
|
||||
|
||||
var ProfileMenu = React.createClass({
|
||||
|
||||
@ -57,7 +57,7 @@ var ProfileMenu = React.createClass({
|
||||
},
|
||||
|
||||
showSaveProfileDialog: function(defaultPath) {
|
||||
|
||||
|
||||
return new Promise(function(resolve) {
|
||||
dialog.showSaveDialog(
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
var Util = require('../../util');
|
||||
var logger = Util.Logger;
|
||||
var remote = require('remote');
|
||||
var remote = require('electron').Remote;
|
||||
|
||||
var RUN_APP = exports.RUN_APP = 'RUN_APP';
|
||||
var RUN_APP_SUCCESS = exports.RUN_APP_SUCCESS = 'RUN_APP_SUCCESS';
|
||||
|
@ -1,8 +1,9 @@
|
||||
var ipc = require('ipc');
|
||||
//var ipc = require('ipc');
|
||||
var ipc = require('electron').ipcMain;
|
||||
var isMainProcess = process.type === 'browser';
|
||||
|
||||
var QUIT_CMD = 'app-util:quit';
|
||||
|
||||
|
||||
exports.quit = function(exitCode) {
|
||||
if(isMainProcess) {
|
||||
process.exit(exitCode);
|
||||
@ -13,7 +14,6 @@ exports.quit = function(exitCode) {
|
||||
|
||||
// Main process, setup listeners
|
||||
if(isMainProcess) {
|
||||
|
||||
ipc.on(QUIT_CMD, function(evt, exitCode) {
|
||||
exports.quit(exitCode);
|
||||
});
|
||||
|
@ -24,6 +24,7 @@ exports.load = function(profileUrl, withImports) {
|
||||
|
||||
for(var node, item = iterator.next(); !item.done; item = iterator.next()) {
|
||||
node = item.value.node;
|
||||
|
||||
// For each import found, load the partial and "mount" it on the current item
|
||||
if(node.import) {
|
||||
var importPath = path.resolve(path.dirname(profileUrl), node.import)
|
||||
|
Reference in New Issue
Block a user