Merge pull request #1573 from webtorrent/small-updates

Small updates
This commit is contained in:
Borewit
2019-04-28 21:55:58 +02:00
committed by GitHub
5 changed files with 505 additions and 266 deletions

743
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -19,7 +19,7 @@
"capture-frame": "^2.0.0",
"chokidar": "^2.0.4",
"chromecasts": "^1.9.1",
"cp-file": "^6.0.0",
"cp-file": "^7.0.0",
"create-torrent": "^3.33.0",
"debounce": "^1.0.0",
"deep-equal": "^1.0.1",
@@ -27,12 +27,12 @@
"drag-drop": "^4.1.0",
"es6-error": "^4.0.0",
"fn-getter": "^1.0.0",
"iso-639-1": "^1.2.1",
"iso-639-1": "^2.0.5",
"languagedetect": "^1.2.0",
"location-history": "^1.0.0",
"material-ui": "^0.20.2",
"mkdirp": "^0.5.1",
"music-metadata": "^3.5.2",
"music-metadata": "^3.6.1",
"network-address": "^1.1.0",
"parse-torrent": "^6.0.1",
"prettier-bytes": "^1.0.1",
@@ -41,7 +41,7 @@
"react-dom": "^16.5.2",
"rimraf": "^2.5.2",
"run-parallel": "^1.1.6",
"semver": "^5.6.0",
"semver": "^6.0.0",
"simple-concat": "^1.0.0",
"simple-get": "^3.0.3",
"srt-to-vtt": "^1.1.1",
@@ -54,7 +54,7 @@
"babel-eslint": "^9.0.0",
"buble": "^0.19.6",
"cross-zip": "^2.0.1",
"depcheck": "^0.6.11",
"depcheck": "^0.7.2",
"electron": "^1.8.8",
"electron-osx-sign": "^0.4.11",
"electron-packager": "~8.5.1",
@@ -63,14 +63,14 @@
"minimist": "^1.2.0",
"nobin-debian-installer": "0.0.10",
"nodemon": "^1.18.8",
"opn": "^5.4.0",
"opn": "^6.0.0",
"plist": "^3.0.1",
"pngjs": "^3.0.0",
"run-series": "^1.1.4",
"spectron": "^3.3.0",
"standard": "*",
"tape": "^4.9.1",
"walk-sync": "^0.3.4"
"walk-sync": "^1.1.3"
},
"engines": {
"node": ">=4.0.0"

View File

@@ -23,13 +23,13 @@ module.exports = {
CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',
APP_COPYRIGHT: 'Copyright © 2014-2018 ' + APP_TEAM,
APP_COPYRIGHT: 'Copyright © 2014-2019 ' + APP_TEAM,
APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
APP_NAME: APP_NAME,
APP_TEAM: APP_TEAM,
APP_VERSION: APP_VERSION,
APP_WINDOW_TITLE: APP_NAME + ' (BETA)',
APP_WINDOW_TITLE: APP_NAME,
CONFIG_PATH: getConfigPath(),

View File

@@ -1,10 +1,10 @@
const mediaExtensions = {
audio: [
'.aac', 'aif', 'aiff', '.asf', '.flac', '.m2a', '.m4a', '.m4b',
'.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus', 'spx', '.wma',
'.wav', '.wv', '.wvp'],
'.aac', '.aif', '.aiff', '.asf', '.dff', '.dsf', '.flac', '.m2a',
'.m4a', '.m4b', '.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus',
'.spx', '.wma', '.wav', '.wv', '.wvp'],
video: [
'.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', 'mpg', 'mpeg',
'.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
'.ogv', '.webm', '.wmv'],
image: ['.gif', '.jpg', '.jpeg', '.png']
}

View File

@@ -53,7 +53,7 @@ function waitForLoad (app, t, opts) {
}).then(function () {
return app.webContents.getTitle()
}).then(function (title) {
// Note the window title is WebTorrent (BETA), this is the HTML <title>
// Note the window title is WebTorrent, this is the HTML <title>
t.equal(title, 'Main Window', 'html title')
})
}