Skip to content

Commit

Permalink
Merge branch 'master' into i-prefer-the-old-line
Browse files Browse the repository at this point in the history
  • Loading branch information
joshaber committed Nov 9, 2017
2 parents fa2b23b + c2bbaf9 commit 9d4c29e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 5 deletions.
6 changes: 6 additions & 0 deletions app/src/ui/resizable/resizable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ export class Resizable extends React.Component<IResizableProps, {}> {

document.addEventListener('mousemove', this.handleDragMove)
document.addEventListener('mouseup', this.handleDragStop)

e.preventDefault()
}

/**
Expand All @@ -64,6 +66,8 @@ export class Resizable extends React.Component<IResizableProps, {}> {
if (this.props.onResize) {
this.props.onResize(newWidthClamped)
}

e.preventDefault()
}

/**
Expand All @@ -73,6 +77,8 @@ export class Resizable extends React.Component<IResizableProps, {}> {
private handleDragStop = (e: MouseEvent) => {
document.removeEventListener('mousemove', this.handleDragMove)
document.removeEventListener('mouseup', this.handleDragStop)

e.preventDefault()
}

/**
Expand Down
16 changes: 11 additions & 5 deletions docs/contributing/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@ You will need to install these tools on your machine:
- *Let Python install into the default suggested path (`c:\Python27`), otherwise you'll have
to configure node-gyp manually with the path which is annoying.*
- *Ensure the **Add python.exe to Path** option is selected.*
- Visual Studio 2015 or [Visual C++ Build Tools](http://go.microsoft.com/fwlink/?LinkId=691126)
- *If you already have Visual Studio 2015 installed, ensure you have the **Common Tools for Visual C++ 2015**
feature as that is required by Node.js for installing native modules.*
- *Visual Studio 2017 support has not been tested yet - see [#1766](https://github.com/desktop/desktop/issues/1766) for details*
- *Run `npm config set msvs_version 2015` to tell node the right toolchain to use for compiling native modules.*
- One of Visual Studio 2015, Visual C++ Build Tools or Visual Studio 2017
- [Visual C++ Build Tools](http://go.microsoft.com/fwlink/?LinkId=691126)
- *Run `npm config set msvs_version 2015` to tell node to use this toolchain.*
- Visual Studio 2015
- *Ensure you select the **Common Tools for Visual C++ 2015** feature as that is required by Node.js
for installing native modules.*
- *Run `npm config set msvs_version 2015` to tell node to use this toolchain.*
- [Visual Studio 2017](https://www.visualstudio.com/vs/community/)
- *Ensure you select the **Desktop development with C++** feature as that is required by Node.js for
installing native modules.*
- *Run `npm config set msvs_version 2017` to tell node to use this toolchain.*

### Fedora 26

Expand Down
1 change: 1 addition & 0 deletions script/eslint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const ESLINT_ARGS = [
'--rulesdir=./eslint-rules',
'./{script,eslint-rules}/**/*.{j,t}s?(x)',
'./tslint-rules/**/*.ts',
'./app/webpack*.js',
'./app/{src,typings,test}/**/*.{j,t}s?(x)',
...process.argv.slice(2),
]
Expand Down

0 comments on commit 9d4c29e

Please sign in to comment.