-
-
Notifications
You must be signed in to change notification settings - Fork 237
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
upgraded to electron 1.4.12 #125
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,3 +6,4 @@ Playback-win32.zip | |
Playback.app | ||
Playback.app.zip | ||
.DS_Store | ||
debug.log |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,10 @@ | ||
#!/usr/bin/env electron | ||
|
||
var app = require('app') | ||
var BrowserWindow = require('browser-window') | ||
var path = require('path') | ||
var ipc = require('electron').ipcMain | ||
var dialog = require('dialog') | ||
var shell = require('shell') | ||
var powerSaveBlocker = require('electron').powerSaveBlocker | ||
var globalShortcut = require('electron').globalShortcut | ||
const | ||
path = require('path'), | ||
{ app, BrowserWindow, dialog, ipcMain, powerSaveBlocker, globalShortcut, shell } = require('electron'); | ||
|
||
var ipc = ipcMain | ||
var win | ||
var link | ||
var ready = false | ||
|
@@ -27,14 +23,13 @@ var onopen = function (e, lnk) { | |
app.on('open-file', onopen) | ||
app.on('open-url', onopen) | ||
|
||
var frame = process.platform === 'win32' | ||
|
||
app.on('ready', function () { | ||
|
||
win = new BrowserWindow({ | ||
title: 'playback', | ||
width: 860, | ||
height: 470, | ||
frame: frame, | ||
frame: false, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. What has changed since you removed the platform check? |
||
show: false, | ||
transparent: true | ||
}) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,11 @@ | ||
const {remote, ipcRenderer} = require('electron'); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. and no |
||
const {Menu, MenuItem, clipboard} = remote; | ||
var request = require('request') | ||
var drop = require('drag-and-drop-files') | ||
var mdns = require('multicast-dns')() | ||
var concat = require('concat-stream') | ||
var vtt = require('srt-to-vtt') | ||
var ipc = require('electron').ipcRenderer | ||
var remote = require('remote') | ||
var Menu = remote.require('menu') | ||
var MenuItem = remote.require('menu-item') | ||
var ipc = ipcRenderer | ||
var http = require('http') | ||
var rangeParser = require('range-parser') | ||
var pump = require('pump') | ||
|
@@ -18,7 +17,6 @@ var network = require('network-address') | |
var chromecasts = require('chromecasts')() | ||
var $ = require('dombo') | ||
var titlebar = require('titlebar')() | ||
var clipboard = require('clipboard') | ||
var player = require('./player') | ||
var playlist = require('./playlist') | ||
var mouseidle = require('./mouseidle') | ||
|
@@ -54,9 +52,7 @@ $(document).on('paste', function (e) { | |
var media = player($('#player')[0]) | ||
var list = playlist() | ||
|
||
if (process.platform !== 'win32') { | ||
titlebar.appendTo('#titlebar') | ||
} | ||
titlebar.appendTo('#titlebar') | ||
|
||
drop($('body')[0], function (files) { | ||
for (var i = 0; i < files.length; i++) { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot for this, much appreciated.
Can you follow the code patterns that's already being used. Mainly that we use
var
and notconst/let
.