Skip to content

Commit

Permalink
1.1.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
tivie committed Jun 21, 2016
1 parent 8ee35b9 commit 3efc897
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 17 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<a name"1.1.0"></a>
## 1.1.0 (2016-06-21)

#### Features
* **vimeo:** Add vimeo support


<a name"1.0.0"></a>
## 1.0.0 (2015-07-21)

Expand Down
22 changes: 13 additions & 9 deletions dist/showdown-youtube.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/showdown-youtube.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/showdown-youtube.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/showdown-youtube.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "showdown-youtube",
"version": "1.0.0",
"version": "1.1.0",
"description": "Embed YouTube videos within showdown",
"keywords": [
"markdown",
"showdown",
"showdown extension",
"youtube"
],
"author": "Estevão Soares dos Santos",
"author": "Estevão Soares dos Santos",
"license": "BSD-2-Clause",
"repository": {
"type": "git",
Expand All @@ -23,7 +23,7 @@
"test": "grunt test"
},
"devDependencies": {
"showdown": "1.1.0",
"showdown": "1.4.0",
"chai": "^2.3.0",
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
Expand Down
2 changes: 1 addition & 1 deletion src/showdown-youtube.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
m, fUrl = '';
if ((m = shortYoutubeRegex.exec(url)) || (m = fullYoutubeRegex.exec(url))) {
fUrl = '//www.youtube.com/embed/' + m[1] + '?rel=0';
} else if (m = vimeoRegex.exec(url)) {
} else if ((m = vimeoRegex.exec(url))) {
fUrl = '//player.vimeo.com/video/' + m[1];
} else {
return match;
Expand Down

0 comments on commit 3efc897

Please sign in to comment.