Merge branch 'patch-1' of https://github.com/omidkrad/skeleton-navigation into omidkrad-patch-1

EisenbergEffect · EisenbergEffect · commit 2847b330ab52 · 2016-06-09T00:46:46.000+02:00
diff --git a/skeleton-es2016/index.js b/skeleton-es2016/index.js
@@ -4,29 +4,29 @@
 
 'use strict';
 
-var app = require('app');
-var BrowserWindow = require('browser-window');
-var mainWindow = null;
+const electron = require('electron');
+const {app} = electron;
+const {BrowserWindow} = electron;
+let mainWindow;
 
-require('crash-reporter').start();
-
-app.on('window-all-closed', function() {
+app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
     app.quit();
   }
 });
 
-app.on('ready', function() {
+app.on('ready', () => {
   mainWindow = new BrowserWindow({
     width: 800,
     height: 600
   });
 
-  mainWindow.loadUrl('file://' + __dirname + '/index.html');
-  mainWindow.webContents.on('did-finish-load', function() {
+  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  mainWindow.webContents.on('did-finish-load', () => {
     mainWindow.setTitle(app.getName());
   });
-  mainWindow.on('closed', function() {
+  
+  mainWindow.on('closed', () => {
     mainWindow = null;
   });
 });
diff --git a/skeleton-typescript/index.html b/skeleton-typescript/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>Aurelia</title>
-    <link rel="stylesheet" href="jspm_packages/npm/font-awesome@4.5.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="jspm_packages/npm/font-awesome@4.6.1/css/font-awesome.min.css">
     <link rel="stylesheet" href="styles/styles.css">
     <meta name="viewport" content="width=device-width, initial-scale=1">
   </head>
diff --git a/skeleton-typescript/index.js b/skeleton-typescript/index.js
@@ -1,32 +1,32 @@
 //Note: This file is provided as an aid to help you get up and running with
 //Electron for desktop apps. See the readme file for more information.
+/* eslint-disable strict, no-var, no-console */
 
 'use strict';
 
-var app = require('app');
-var BrowserWindow = require('browser-window');
+const electron = require('electron');
+const {app} = electron;
+const {BrowserWindow} = electron;
+let mainWindow;
 
-require('crash-reporter').start();
-
-var mainWindow = null;
-
-app.on('window-all-closed', function () {
-    if (process.platform != 'darwin') {
-        app.quit();
-    }
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
 });
 
-app.on('ready', function () {
-    mainWindow = new BrowserWindow({
-        width: 800,
-        height: 600
-    });
+app.on('ready', () => {
+  mainWindow = new BrowserWindow({
+    width: 800,
+    height: 600
+  });
 
-    mainWindow.loadUrl('file://' + __dirname + '/index.html');
-    mainWindow.webContents.on('did-finish-load', function () {
-        mainWindow.setTitle(app.getName());
-    });
-    mainWindow.on('closed', function () {
-        mainWindow = null;
-    });
+  mainWindow.loadURL(`file://${__dirname}/index.html`);
+  mainWindow.webContents.on('did-finish-load', () => {
+    mainWindow.setTitle(app.getName());
+  });
+  
+  mainWindow.on('closed', () => {
+    mainWindow = null;
+  });
 });
