OS X -> Mac
This commit is contained in:
@@ -109,7 +109,7 @@ function openTorrentAddress () {
|
||||
}
|
||||
|
||||
/**
|
||||
* Dialogs on do not show a title on OS X, so the window title is used instead.
|
||||
* Dialogs on do not show a title on Mac, so the window title is used instead.
|
||||
*/
|
||||
function setTitle (title) {
|
||||
if (process.platform === 'darwin') {
|
||||
|
||||
@@ -12,7 +12,7 @@ var dialog = require('./dialog')
|
||||
var log = require('./log')
|
||||
|
||||
/**
|
||||
* Add a right-click menu to the dock icon. (OS X)
|
||||
* Add a right-click menu to the dock icon. (Mac)
|
||||
*/
|
||||
function init () {
|
||||
if (!app.dock) return
|
||||
@@ -21,7 +21,7 @@ function init () {
|
||||
}
|
||||
|
||||
/**
|
||||
* Bounce the Downloads stack if `path` is inside the Downloads folder. (OS X)
|
||||
* Bounce the Downloads stack if `path` is inside the Downloads folder. (Mac)
|
||||
*/
|
||||
function downloadFinished (path) {
|
||||
if (!app.dock) return
|
||||
@@ -30,7 +30,7 @@ function downloadFinished (path) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a counter badge for the app. (OS X, Linux)
|
||||
* Display a counter badge for the app. (Mac, Linux)
|
||||
*/
|
||||
function setBadge (count) {
|
||||
log(`setBadge: ${count}`)
|
||||
|
||||
@@ -34,7 +34,7 @@ function installDarwin () {
|
||||
var electron = require('electron')
|
||||
var app = electron.app
|
||||
|
||||
// On OS X, only protocols that are listed in `Info.plist` can be set as the
|
||||
// On Mac, only protocols that are listed in `Info.plist` can be set as the
|
||||
// default handler at runtime.
|
||||
app.setAsDefaultProtocolClient('magnet')
|
||||
app.setAsDefaultProtocolClient('stream-magnet')
|
||||
|
||||
@@ -153,7 +153,7 @@ function processArgv (argv) {
|
||||
} else if (arg === '-u') {
|
||||
dialog.openTorrentAddress()
|
||||
} else if (arg.startsWith('-psn')) {
|
||||
// Ignore OS X launchd "process serial number" argument
|
||||
// Ignore Mac launchd "process serial number" argument
|
||||
// Issue: https://github.com/feross/webtorrent-desktop/issues/214
|
||||
} else {
|
||||
torrentIds.push(arg)
|
||||
|
||||
@@ -281,7 +281,7 @@ function getMenuTemplate () {
|
||||
]
|
||||
|
||||
if (process.platform === 'darwin') {
|
||||
// Add WebTorrent app menu (OS X)
|
||||
// Add WebTorrent app menu (Mac)
|
||||
template.unshift({
|
||||
label: config.APP_NAME,
|
||||
submenu: [
|
||||
@@ -324,7 +324,7 @@ function getMenuTemplate () {
|
||||
]
|
||||
})
|
||||
|
||||
// Add Window menu (OS X)
|
||||
// Add Window menu (Mac)
|
||||
template.splice(5, 0, {
|
||||
role: 'window',
|
||||
submenu: [
|
||||
|
||||
@@ -21,7 +21,7 @@ function init () {
|
||||
if (process.platform === 'win32') {
|
||||
initWin32()
|
||||
}
|
||||
// OS X apps generally do not have menu bar icons
|
||||
// Mac apps generally do not have menu bar icons
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -37,7 +37,7 @@ function init () {
|
||||
minWidth: config.WINDOW_MIN_WIDTH,
|
||||
minHeight: config.WINDOW_MIN_HEIGHT,
|
||||
title: config.APP_WINDOW_TITLE,
|
||||
titleBarStyle: 'hidden-inset', // Hide title bar (OS X)
|
||||
titleBarStyle: 'hidden-inset', // Hide title bar (Mac)
|
||||
useContentSize: true, // Specify web page size without OS chrome
|
||||
width: 500,
|
||||
height: HEADER_HEIGHT + (TORRENT_HEIGHT * 6) // header height + 5 torrents
|
||||
@@ -95,7 +95,7 @@ function send (...args) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Enforce window aspect ratio. Remove with 0. (OS X)
|
||||
* Enforce window aspect ratio. Remove with 0. (Mac)
|
||||
*/
|
||||
function setAspectRatio (aspectRatio) {
|
||||
if (!main.win) return
|
||||
@@ -196,7 +196,7 @@ function toggleFullScreen (flag) {
|
||||
log(`toggleFullScreen ${flag}`)
|
||||
|
||||
if (flag) {
|
||||
// Fullscreen and aspect ratio do not play well together. (OS X)
|
||||
// Fullscreen and aspect ratio do not play well together. (Mac)
|
||||
main.win.setAspectRatio(0)
|
||||
}
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ function getDefaultState () {
|
||||
*
|
||||
* Config path:
|
||||
*
|
||||
* OS X ~/Library/Application Support/WebTorrent/config.json
|
||||
* Mac ~/Library/Application Support/WebTorrent/config.json
|
||||
* Linux (XDG) $XDG_CONFIG_HOME/WebTorrent/config.json
|
||||
* Linux (Legacy) ~/.config/WebTorrent/config.json
|
||||
* Windows (> Vista) %LOCALAPPDATA%/WebTorrent/config.json
|
||||
|
||||
@@ -416,7 +416,7 @@ function onVisibilityChange () {
|
||||
function onFullscreenChanged (e, isFullScreen) {
|
||||
state.window.isFullScreen = isFullScreen
|
||||
if (!isFullScreen) {
|
||||
// Aspect ratio gets reset in fullscreen mode, so restore it (OS X)
|
||||
// Aspect ratio gets reset in fullscreen mode, so restore it (Mac)
|
||||
ipcRenderer.send('setAspectRatio', state.playing.aspectRatio)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user