Skip to content

Commit 23db89d

Browse files
committed
fix bugs
1 parent e5fee2c commit 23db89d

3 files changed

Lines changed: 9 additions & 17 deletions

File tree

api.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ var getFeedData = function (site) {
6464
}
6565
};
6666

67-
var initSampleSites = function(site) {
68-
db.sites.insert(site, function (err, site) {
69-
if (err) {
70-
console.log('Error occured during site save');
71-
}
72-
});
73-
};
74-
7567
var getFeeds = function () {
7668
db.sites.find({}, function (err, sites) {
7769
if (err) {
@@ -122,7 +114,7 @@ app.post('/api/sites', function (req, res) {
122114
if (err) {
123115
res.send({ error: err });
124116
} else {
125-
res.send({ data: req.body });
117+
res.send({ data: site });
126118
}
127119
});
128120
});

electron.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
var backRssApi = require('./api');
2-
var electron = require('app');
3-
var BrowserWindow = require('browser-window');
4-
var shell = require('shell');
5-
var Menu = require('menu');
6-
var MenuItem = require('menu-item');
2+
var electron = require('electron').app;
3+
var BrowserWindow = require('electron').BrowserWindow;
4+
var shell = require('electron').Shell;
5+
var Menu = require('electron').Menu;
6+
var MenuItem = require('electron').MenuItem;
77

88
backRssApi.start();
99

@@ -73,7 +73,7 @@ if (process.platform !== 'darwin') {
7373
if (!aboutWindow) {
7474
aboutWindow = new BrowserWindow({ width: 400, height: 120, "node-integration": false, frame: true,
7575
resizable: false, "always-on-top": true });
76-
aboutWindow.loadUrl('http://localhost:8080/about.html');
76+
aboutWindow.loadURL('http://localhost:8080/about.html');
7777

7878
aboutWindow.on('closed', function () {
7979
aboutWindow = null;
@@ -159,7 +159,7 @@ if (process.platform !== 'darwin') {
159159
}
160160

161161
function createMainWindow() {
162-
mainWindow = new BrowserWindow({ width: 1200, height: 768, "node-integration": false, icon: __dirname + '/public/images/icon.png'});
162+
mainWindow = new BrowserWindow({ width: 1200, height: 768, webPreferences: { nodeIntegration: false }, icon: __dirname + '/public/images/icon.png'});
163163
mainWindow.loadURL('http://localhost:8080');
164164

165165
mainWindow.on('closed', function() {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "BackRSS",
3-
"version": "1.0.0",
3+
"version": "1.0.2",
44
"description": "Simple RSS reader",
55
"main": "electron.js",
66
"scripts": {

0 commit comments

Comments
 (0)