masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2 from torhve/electron 

Bump to electron 1.0
This commit is contained in:
Magnus Hauge Bakke 2016-05-18 07:31:00 +02:00
parent 60a6111671 af15a00828
commit d683ae0c66
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electron-main.js
View File

@ -6,7 +6,7 @@
const ipcMain = require('electron').ipcMain; const ipcMain = require('electron').ipcMain;
const nativeImage = require('electron').nativeImage; const nativeImage = require('electron').nativeImage;
const Menu = require('menu'); const Menu = require('electron').Menu;
var template; var template;
@ -186,7 +186,7 @@
Menu.setApplicationMenu(menu); Menu.setApplicationMenu(menu);
mainWindow = new BrowserWindow({width: 1280, height: 800, 'min-width': 1024, 'min-height': 600, 'autoHideMenuBar': true, 'web-security': true, 'java': false, 'accept-first-mouse': true, defaultEncoding: 'UTF-8', 'icon':'file://'+__dirname + '/assets/img/favicon.png'}); mainWindow = new BrowserWindow({width: 1280, height: 800, 'min-width': 1024, 'min-height': 600, 'autoHideMenuBar': true, 'web-security': true, 'java': false, 'accept-first-mouse': true, defaultEncoding: 'UTF-8', 'icon':'file://'+__dirname + '/assets/img/favicon.png'});
mainWindow.loadUrl('file://' + __dirname + '/electron-start.html'); mainWindow.loadURL('file://' + __dirname + '/electron-start.html');
mainWindow.focus(); mainWindow.focus();
// Listen for badge changes // Listen for badge changes

3
electron-start.html
View File

@ -7,6 +7,7 @@ onload = function() {
const ipc= require('electron').ipcRenderer; const ipc= require('electron').ipcRenderer;
const remote = require('electron').remote; const remote = require('electron').remote;
const nativeImage = require('electron').nativeImage; const nativeImage = require('electron').nativeImage;
const shell = require('electron').shell;
var webview = document.getElementById("glowingbear"); var webview = document.getElementById("glowingbear");
@ -14,7 +15,7 @@ onload = function() {
console.log("webview: " + e.message); console.log("webview: " + e.message);
} }
var handlenewwindow = function(e) { var handlenewwindow = function(e) {
require('shell').openExternal(e.url); shell.openExternal(e.url);
} }
var handletitleset = function(e) { var handletitleset = function(e) {
document.title = e.title; document.title = e.title;

6
electron.makefile
View File

@ -18,10 +18,10 @@ uselocal: copylocal
# build the electron app for various platforms # build the electron app for various platforms
build-electron-windows: uselocal build-electron-windows: uselocal
electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=0.37.6 --icon=assets/img/favicon.ico --asar=true electron-packager ${ELECTRON_COMMON} --platform=win32 --arch=ia32 --version=1.0.0 --icon=assets/img/favicon.ico --asar=true
build-electron-darwin: uselocal build-electron-darwin: uselocal
electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=0.37.6 --icon=assets/img/glowing-bear.icns electron-packager ${ELECTRON_COMMON} --platform=darwin --arch=x64 --version=1.0.0 --icon=assets/img/glowing-bear.icns
build-electron-linux: uselocal build-electron-linux: uselocal
electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=0.37.6 --icon=assets/img/favicon.ico electron-packager ${ELECTRON_COMMON} --platform=linux --arch=x64 --version=1.0.0 --icon=assets/img/favicon.ico