diff --git a/desktop-capture/app.js b/desktop-capture/app.js index 7d5507d..bed1ffa 100644 --- a/desktop-capture/app.js +++ b/desktop-capture/app.js @@ -12,10 +12,10 @@ // limitations under the License. // Author: Dongseong Hwang (dongseong.hwang@intel.com) -var desktopCapturer = require('desktop-capturer'); +const {desktopCapturer} = require('electron'); -var desktopSharing = false; -var localStream = null; +let desktopSharing = false; +let localStream; function refresh() { $('select').imagepicker({ @@ -28,15 +28,15 @@ function addSource(source) { value: source.id.replace(":", ""), text: source.name })); - $('select option[value="' + source.id.replace(":", "") + '"]').attr('data-img-src', source.thumbnail.toDataUrl()); + $('select option[value="' + source.id.replace(":", "") + '"]').attr('data-img-src', source.thumbnail.toDataURL()); refresh(); } function showSources() { desktopCapturer.getSources({ types:['window', 'screen'] }, function(error, sources) { - for (var i = 0; i < sources.length; ++i) { - console.log("Name: " + sources[i].name); - addSource(sources[i]); + for (let source of sources) { + console.log("Name: " + source.name); + addSource(source); } }); } diff --git a/desktop-capture/main.js b/desktop-capture/main.js index 1944f5f..480fa6a 100644 --- a/desktop-capture/main.js +++ b/desktop-capture/main.js @@ -1,21 +1,20 @@ -var app = require('app'); -var BrowserWindow = require('browser-window'); +const {app, BrowserWindow} = require('electron'); -var mainWindow = null; +let mainWindow; -app.on('window-all-closed', function() { +app.on('window-all-closed', () => { if (process.platform != 'darwin') app.quit(); }); app.setPath("userData", __dirname + "/saved_recordings"); -app.on('ready', function() { +app.on('ready', () => { mainWindow = new BrowserWindow({width: 800, height: 600}); mainWindow.loadURL('file://' + __dirname + '/index.html'); - mainWindow.on('closed', function() { + mainWindow.on('closed', () => { mainWindow = null; }); }); diff --git a/desktop-capture/package.json b/desktop-capture/package.json index d833f33..b652680 100644 --- a/desktop-capture/package.json +++ b/desktop-capture/package.json @@ -1,5 +1,5 @@ { "name" : "desktop-capture-demo", - "version" : "0.1.0", + "version" : "1.1.0", "main" : "main.js" } diff --git a/desktop-capture/readme.md b/desktop-capture/readme.md index 1f39298..892ef32 100644 --- a/desktop-capture/readme.md +++ b/desktop-capture/readme.md @@ -7,10 +7,6 @@ A sample app allows you to choose which screen or window to be captured with [desktopCapturer](https://github.com/atom/electron/blob/master/docs/api/desktop-capturer.md) -## Required minimum version - -v0.36.0 - ## Screenshot ![screenshot](https://cloud.githubusercontent.com/assets/2557445/10268326/993e4f9a-6ae7-11e5-8fd1-a24b9800b9ce.gif)