Use electron module
This commit is contained in:
10
src/index.js
10
src/index.js
@@ -1,6 +1,7 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var remote = require('remote');
|
const electron = require('electron');
|
||||||
|
const remote = electron.remote;
|
||||||
var url = require('url');
|
var url = require('url');
|
||||||
|
|
||||||
var contextMenu = require('./menus/context');
|
var contextMenu = require('./menus/context');
|
||||||
@@ -8,7 +9,7 @@ var contextMenu = require('./menus/context');
|
|||||||
var webView = document.getElementById('mainWebview');
|
var webView = document.getElementById('mainWebview');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
var configFile = remote.require('app').getPath('userData') + '/config.json';
|
var configFile = electron.remote.app.getPath('userData') + '/config.json';
|
||||||
var config = require(configFile);
|
var config = require(configFile);
|
||||||
if (config.url) {
|
if (config.url) {
|
||||||
webView.setAttribute('src', config.url);
|
webView.setAttribute('src', config.url);
|
||||||
@@ -60,12 +61,11 @@ var showUnreadBadge = function(unreadCount) {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'darwin':
|
case 'darwin':
|
||||||
var app = remote.require('app');
|
|
||||||
if (unreadCount > 0) {
|
if (unreadCount > 0) {
|
||||||
app.dock.setBadge(unreadCount.toString());
|
remote.app.dock.setBadge(unreadCount.toString());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
app.dock.setBadge('');
|
remote.app.dock.setBadge('');
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
11
src/main.js
11
src/main.js
@@ -1,10 +1,11 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var app = require('app'); // Module to control application life.
|
const electron = require('electron');
|
||||||
var BrowserWindow = require('browser-window'); // Module to create native browser window.
|
const app = electron.app; // Module to control application life.
|
||||||
var Menu = require('menu');
|
const BrowserWindow = electron.BrowserWindow; // Module to create native browser window.
|
||||||
var Tray = require('tray');
|
const Menu = electron.Menu;
|
||||||
var ipc = require('ipcMain');
|
const Tray = electron.Tray;
|
||||||
|
const ipc = electron.ipcMain;
|
||||||
var appMenu = require('./menus/app');
|
var appMenu = require('./menus/app');
|
||||||
|
|
||||||
var client = null;
|
var client = null;
|
||||||
|
@@ -1,9 +1,10 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var Menu = require('menu');
|
const electron = require('electron');
|
||||||
|
const Menu = electron.Menu;
|
||||||
|
|
||||||
var createTemplate = function(mainWindow) {
|
var createTemplate = function(mainWindow) {
|
||||||
var app_name = require('app').getName()
|
var app_name = electron.app.getName();
|
||||||
var first_menu_name = (process.platform === 'darwin') ? app_name : 'File';
|
var first_menu_name = (process.platform === 'darwin') ? app_name : 'File';
|
||||||
var template = [];
|
var template = [];
|
||||||
template.push({
|
template.push({
|
||||||
@@ -20,7 +21,7 @@ var createTemplate = function(mainWindow) {
|
|||||||
label: 'Quit',
|
label: 'Quit',
|
||||||
accelerator: 'CmdOrCtrl+Q',
|
accelerator: 'CmdOrCtrl+Q',
|
||||||
click: function(item, focusedWindow) {
|
click: function(item, focusedWindow) {
|
||||||
require('app').quit();
|
electron.app.quit();
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
});
|
});
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var remote = require('remote');
|
const remote = require('electron').remote;
|
||||||
var Menu = remote.require('menu');
|
const Menu = remote.Menu;
|
||||||
var MenuItem = remote.require('menu-item');
|
const MenuItem = remote.MenuItem;
|
||||||
|
|
||||||
var createDefault = function() {
|
var createDefault = function() {
|
||||||
var menu = new Menu();
|
var menu = new Menu();
|
||||||
|
@@ -1,7 +1,8 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var Menu = require('menu');
|
const electron = require('electron');
|
||||||
var MenuItem = require('menu-item');
|
const Menu = electron.Menu;
|
||||||
|
const MenuItem = electron.MenuItem;
|
||||||
|
|
||||||
var createDefault = function() {
|
var createDefault = function() {
|
||||||
var menu = new Menu();
|
var menu = new Menu();
|
||||||
|
@@ -15,11 +15,11 @@
|
|||||||
<input type="button" value="Cancel" onclick="goBack()">
|
<input type="button" value="Cancel" onclick="goBack()">
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var remote = require('remote');
|
const remote = require('electron').remote;
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
|
|
||||||
var saveSettings = function() {
|
var saveSettings = function() {
|
||||||
var configFile = remote.require('app').getPath('userData') + '/config.json';
|
var configFile = remote.app.getPath('userData') + '/config.json';
|
||||||
var urlInput = document.getElementById('url');
|
var urlInput = document.getElementById('url');
|
||||||
var config = {
|
var config = {
|
||||||
url: urlInput.value
|
url: urlInput.value
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var ipc = require('ipcRenderer');
|
const ipc = require('electron').ipcRenderer;
|
||||||
|
|
||||||
ipc.on('retrieveUnreadCount', function() {
|
ipc.on('retrieveUnreadCount', function() {
|
||||||
var unreadCount = document.getElementsByClassName('unread-title').length;
|
var unreadCount = document.getElementsByClassName('unread-title').length;
|
||||||
|
Reference in New Issue
Block a user