Merge pull request #6870 from electron/more-permissive-standard-markdown
Use a more permissive version of standard-markdown
This commit is contained in:
commit
09adffe48f
8 changed files with 12 additions and 10 deletions
|
@ -41,7 +41,7 @@ otherwise it returns `undefined`.
|
||||||
The `filters` specifies an array of file types that can be displayed or
|
The `filters` specifies an array of file types that can be displayed or
|
||||||
selected when you want to limit the user to a specific type. For example:
|
selected when you want to limit the user to a specific type. For example:
|
||||||
|
|
||||||
```
|
```javascript
|
||||||
{
|
{
|
||||||
filters: [
|
filters: [
|
||||||
{name: 'Images', extensions: ['jpg', 'png', 'gif']},
|
{name: 'Images', extensions: ['jpg', 'png', 'gif']},
|
||||||
|
|
|
@ -359,7 +359,7 @@ the first item.
|
||||||
|
|
||||||
Template:
|
Template:
|
||||||
|
|
||||||
```
|
```javascript
|
||||||
[
|
[
|
||||||
{label: '4', id: '4'},
|
{label: '4', id: '4'},
|
||||||
{label: '5', id: '5'},
|
{label: '5', id: '5'},
|
||||||
|
@ -381,7 +381,7 @@ Menu:
|
||||||
|
|
||||||
Template:
|
Template:
|
||||||
|
|
||||||
```
|
```javascript
|
||||||
[
|
[
|
||||||
{label: 'a', position: 'endof=letters'},
|
{label: 'a', position: 'endof=letters'},
|
||||||
{label: '1', position: 'endof=numbers'},
|
{label: '1', position: 'endof=numbers'},
|
||||||
|
|
|
@ -197,7 +197,7 @@ Sets when the tray's icon background becomes highlighted (in blue).
|
||||||
by toggling between `'never'` and `'always'` modes when the window visibility
|
by toggling between `'never'` and `'always'` modes when the window visibility
|
||||||
changes.
|
changes.
|
||||||
|
|
||||||
```js
|
```javascript
|
||||||
const {BrowserWindow, Tray} = require('electron')
|
const {BrowserWindow, Tray} = require('electron')
|
||||||
|
|
||||||
const win = new BrowserWindow({width: 800, height: 600})
|
const win = new BrowserWindow({width: 800, height: 600})
|
||||||
|
|
|
@ -22,7 +22,7 @@ console.log(contents)
|
||||||
|
|
||||||
These methods can be accessed from the `webContents` module:
|
These methods can be accessed from the `webContents` module:
|
||||||
|
|
||||||
```js
|
```javascript
|
||||||
const {webContents} = require('electron')
|
const {webContents} = require('electron')
|
||||||
console.log(webContents)
|
console.log(webContents)
|
||||||
```
|
```
|
||||||
|
@ -843,7 +843,7 @@ The `callback` will be called with `callback(error, data)` on completion. The
|
||||||
|
|
||||||
By default, an empty `options` will be regarded as:
|
By default, an empty `options` will be regarded as:
|
||||||
|
|
||||||
```
|
```javascript
|
||||||
{
|
{
|
||||||
marginsType: 0,
|
marginsType: 0,
|
||||||
printBackground: false,
|
printBackground: false,
|
||||||
|
|
|
@ -119,7 +119,7 @@ console.log(webFrame.getResourceUsage())
|
||||||
|
|
||||||
This will generate:
|
This will generate:
|
||||||
|
|
||||||
```
|
```javascript
|
||||||
{
|
{
|
||||||
images: {
|
images: {
|
||||||
count: 22,
|
count: 22,
|
||||||
|
@ -133,7 +133,7 @@ This will generate:
|
||||||
xslStyleSheets: { /* same with "images" */ },
|
xslStyleSheets: { /* same with "images" */ },
|
||||||
fonts: { /* same with "images" */ },
|
fonts: { /* same with "images" */ },
|
||||||
other: { /* same with "images" */ }
|
other: { /* same with "images" */ }
|
||||||
})
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### `webFrame.clearCache()`
|
### `webFrame.clearCache()`
|
||||||
|
|
|
@ -47,6 +47,8 @@ For API references, there are exceptions to this rule.
|
||||||
* Use `bash` instead of `cmd` in code blocks (due to the syntax highlighter).
|
* Use `bash` instead of `cmd` in code blocks (due to the syntax highlighter).
|
||||||
* Lines should be wrapped at 80 columns.
|
* Lines should be wrapped at 80 columns.
|
||||||
* No nesting lists more than 2 levels (due to the markdown renderer).
|
* No nesting lists more than 2 levels (due to the markdown renderer).
|
||||||
|
* All `js` and `javascript` code blocks are linted with
|
||||||
|
[standard-markdown](http://npm.im/standard-markdown).
|
||||||
|
|
||||||
## Picking words
|
## Picking words
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,7 @@ has helpers to access Electron APIs in your tests and bundles ChromeDriver.
|
||||||
$ npm install --save-dev spectron
|
$ npm install --save-dev spectron
|
||||||
```
|
```
|
||||||
|
|
||||||
```js
|
```javascript
|
||||||
// A simple test to verify a visible window is opened with a title
|
// A simple test to verify a visible window is opened with a title
|
||||||
var Application = require('spectron').Application
|
var Application = require('spectron').Application
|
||||||
var assert = require('assert')
|
var assert = require('assert')
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
"electabul": "~0.0.4",
|
"electabul": "~0.0.4",
|
||||||
"request": "*",
|
"request": "*",
|
||||||
"standard": "^7.1.2",
|
"standard": "^7.1.2",
|
||||||
"standard-markdown": "^1.1.1"
|
"standard-markdown": "^1.2.1"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"runas": "^3.0.0"
|
"runas": "^3.0.0"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue