mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Merge remote-tracking branch 'upstream/master' into no-var
This commit is contained in:
2649
package-lock.json
generated
2649
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -18,7 +18,6 @@
|
||||
"@atom/nsfw": "^1.0.27",
|
||||
"@atom/source-map-support": "^0.3.4",
|
||||
"@atom/watcher": "^1.3.5",
|
||||
"@hyurl/structured-clone": "^0.3.0",
|
||||
"about": "file:packages/about",
|
||||
"archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball",
|
||||
"async": "3.2.0",
|
||||
@@ -41,7 +40,7 @@
|
||||
"base16-tomorrow-light-theme": "file:packages/base16-tomorrow-light-theme",
|
||||
"bookmarks": "https://www.atom.io/api/packages/bookmarks/versions/0.46.0/tarball",
|
||||
"bracket-matcher": "https://www.atom.io/api/packages/bracket-matcher/versions/0.91.2/tarball",
|
||||
"chai": "4.2.0",
|
||||
"chai": "4.3.4",
|
||||
"chart.js": "2.9.4",
|
||||
"clear-cut": "^2.0.2",
|
||||
"coffee-script": "1.12.7",
|
||||
@@ -61,14 +60,14 @@
|
||||
"find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.7/tarball",
|
||||
"find-parent-dir": "^0.3.0",
|
||||
"first-mate": "7.4.1",
|
||||
"focus-trap": "6.1.4",
|
||||
"focus-trap": "6.3.0",
|
||||
"fs-admin": "0.15.0",
|
||||
"fs-plus": "^3.1.1",
|
||||
"fstream": "1.0.12",
|
||||
"fuzzaldrin": "^2.1",
|
||||
"fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.14.3/tarball",
|
||||
"git-diff": "file:packages/git-diff",
|
||||
"git-utils": "5.6.2",
|
||||
"git-utils": "5.7.1",
|
||||
"github": "https://www.atom.io/api/packages/github/versions/0.36.9/tarball",
|
||||
"glob": "^7.1.1",
|
||||
"go-to-line": "file:packages/go-to-line",
|
||||
@@ -127,7 +126,7 @@
|
||||
"mocha-junit-reporter": "2.0.0",
|
||||
"mocha-multi-reporters": "^1.1.4",
|
||||
"mock-spawn": "^0.2.6",
|
||||
"normalize-package-data": "3.0.0",
|
||||
"normalize-package-data": "3.0.2",
|
||||
"notifications": "https://www.atom.io/api/packages/notifications/versions/0.71.0/tarball",
|
||||
"nslog": "^3.0.0",
|
||||
"one-dark-syntax": "file:packages/one-dark-syntax",
|
||||
|
||||
@@ -19,6 +19,7 @@ const git = (git, repositoryRootPath) => {
|
||||
}
|
||||
|
||||
async function createOrCheckoutBranch(newBranch) {
|
||||
await git.fetch();
|
||||
const { branches } = await git.branch();
|
||||
const found = Object.keys(branches).find(
|
||||
branch => branch.indexOf(newBranch) > -1
|
||||
|
||||
@@ -9,7 +9,6 @@ const getAppName = require('../get-app-name');
|
||||
const path = require('path');
|
||||
const url = require('url');
|
||||
const { EventEmitter } = require('events');
|
||||
const { compose } = require('@hyurl/structured-clone');
|
||||
const StartupTime = require('../startup-time');
|
||||
|
||||
const ICON_PATH = path.resolve(__dirname, '..', '..', 'resources', 'atom.png');
|
||||
@@ -375,7 +374,7 @@ module.exports = class AtomWindow extends EventEmitter {
|
||||
sendCommandToBrowserWindow(command, ...args) {
|
||||
const action =
|
||||
args[0] && args[0].contextCommand ? 'context-command' : 'command';
|
||||
this.browserWindow.webContents.send(action, command, compose(...args));
|
||||
this.browserWindow.webContents.send(action, command, ...args);
|
||||
}
|
||||
|
||||
getDimensions() {
|
||||
|
||||
@@ -16,7 +16,6 @@ module.exports = class ContextMenu {
|
||||
if (item.command) {
|
||||
if (!item.commandDetail) item.commandDetail = {};
|
||||
item.commandDetail.contextCommand = true;
|
||||
item.commandDetail.atomWindow = this.atomWindow;
|
||||
item.click = () => {
|
||||
global.atomApplication.sendCommandToWindow(
|
||||
item.command,
|
||||
|
||||
Reference in New Issue
Block a user