Skip to content

Commit

Permalink
Merge branch 'master' into babel7
Browse files Browse the repository at this point in the history
  • Loading branch information
yhatt committed Jan 13, 2018
2 parents 62ad285 + da350eb commit bf89917
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Changed

* Upgrade Babel to v7 beta ([#23](https://github.com/yhatt/markdown-it-incremental-dom/pull/23))
* Update README.md and demo page to use jsDelivr CDN ([#24](https://github.com/yhatt/markdown-it-incremental-dom/pull/24))

## v1.1.2 - 2018-01-11

Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Define as `window.markdownitIncrementalDOM`.
<html>
<head>
<script src="https://ajax.googleapis.com/ajax/libs/incrementaldom/0.5.1/incremental-dom-min.js"></script>
<script src="https://cdn.jsdelivr.net/markdown-it/8.3.1/markdown-it.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/markdown-it@8.4.0/dist/markdown-it.min.js"></script>
<script src="./node_modules/markdown-it-incremental-dom/dist/markdown-it-incremental-dom.min.js"></script>
</head>
<body>
Expand All @@ -63,10 +63,14 @@ Define as `window.markdownitIncrementalDOM`.

#### CDN

You can use the recent version through CDN provides by [unpkg.com](https://unpkg.com/).
You can use [the recent version through CDN](https://cdn.jsdelivr.net/npm/markdown-it-incremental-dom@1/dist/markdown-it-incremental-dom.min.js) provides by [jsDelivr](https://www.jsdelivr.com/).

* **[Compressed (Recommend)](https://unpkg.com/markdown-it-incremental-dom/dist/markdown-it-incremental-dom.min.js)**
* [Uncompressed](https://unpkg.com/markdown-it-incremental-dom/dist/markdown-it-incremental-dom.js)
```html
<script src="https://cdn.jsdelivr.net/npm/markdown-it-incremental-dom@1/dist/markdown-it-incremental-dom.min.js"></script>
```

* **[Compressed (Recommend)](https://cdn.jsdelivr.net/npm/markdown-it-incremental-dom@1/dist/markdown-it-incremental-dom.min.js)**
* [Uncompressed](https://cdn.jsdelivr.net/npm/markdown-it-incremental-dom@1/dist/markdown-it-incremental-dom.js)

## Installation

Expand Down
8 changes: 3 additions & 5 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>markdown-it-incremental-dom</title>

<script src="https://cdnjs.cloudflare.com/ajax/libs/superagent/3.5.0/superagent.min.js"></script>
<script src="https://cdn.jsdelivr.net/markdown-it/8.3.1/markdown-it.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/incrementaldom/0.5.1/incremental-dom-min.js"></script>
<script src="https://unpkg.com/markdown-it-incremental-dom/dist/markdown-it-incremental-dom.min.js"></script>
<script src="https://cdn.jsdelivr.net/combine/npm/superagent@3.8.2/superagent.min.js,npm/markdown-it@8.4.0/dist/markdown-it.min.js,npm/incremental-dom@0.5.1/dist/incremental-dom-min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/markdown-it-incremental-dom/dist/markdown-it-incremental-dom.min.js"></script>
<script src="./index.js"></script>

<link rel="stylesheet" href="./index.css" />
<link rel="stylesheet" href="https://unpkg.com/github-markdown-css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/github-markdown-css/github-markdown.min.css">
</head>
<body>
<div class="container">
Expand Down

0 comments on commit bf89917

Please sign in to comment.