From 6953fb45bad67350059f59464fda89fe569569f1 Mon Sep 17 00:00:00 2001 From: Haojian Wu Date: Sat, 21 May 2016 21:47:55 +0200 Subject: [PATCH] :arrow_up: webview browser. --- webview/browser/browser.js | 2 +- webview/browser/main.js | 8 ++++---- webview/browser/package.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/webview/browser/browser.js b/webview/browser/browser.js index 855e298..467e55d 100644 --- a/webview/browser/browser.js +++ b/webview/browser/browser.js @@ -244,7 +244,7 @@ function handleKeyDown(event) { function handleLoadCommit() { resetExitedState(); var webview = document.querySelector('webview'); - document.querySelector('#location').value = webview.getUrl(); + document.querySelector('#location').value = webview.getURL(); document.querySelector('#back').disabled = !webview.canGoBack(); document.querySelector('#forward').disabled = !webview.canGoForward(); closeBoxes(); diff --git a/webview/browser/main.js b/webview/browser/main.js index d39f109..73f91aa 100644 --- a/webview/browser/main.js +++ b/webview/browser/main.js @@ -1,13 +1,13 @@ -var app = require('app'); -var BrowserWindow = require('browser-window'); +const {app, BrowserWindow} = require('electron'); + +let mainWindow; -var mainWindow = null; app.on('window-all-closed', function() { app.quit(); }); app.on('ready', function() { mainWindow = new BrowserWindow({width: 1024, height: 768 }); - mainWindow.loadUrl('file://' + __dirname + '/browser.html'); + mainWindow.loadURL('file://' + __dirname + '/browser.html'); mainWindow.openDevTools(); }); diff --git a/webview/browser/package.json b/webview/browser/package.json index 1d1931c..493b634 100644 --- a/webview/browser/package.json +++ b/webview/browser/package.json @@ -1,5 +1,5 @@ { "name": "Browser Sample", - "version": "1.0", + "version": "1.1.0", "main": "main.js" }