Skip to content

Commit 6bbe7f4

Browse files
committed
Merge pull request btford#39 from tivie/patch-1
update markdown.js to use the latest showdown lib
2 parents 4e99c3c + 134e34a commit 6bbe7f4

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

bower.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
"dependencies": {
66
"angular": "^1.0.8",
77
"angular-sanitize": "^1.0.8",
8-
"showdown": "~0.3.1"
8+
"showdown": "^1.0.0"
99
},
1010
"devDependencies": {
11-
"angular-mocks": "^1.0.8"
11+
"angular-mocks": "^1.0.8",
12+
"showdown-twitter": "*"
1213
}
1314
}

karma.conf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module.exports = function (config) {
77
'bower_components/angular/angular.js',
88
'bower_components/angular-sanitize/angular-sanitize.js',
99
'bower_components/angular-mocks/angular-mocks.js',
10-
'bower_components/showdown/src/showdown.js',
11-
'bower_components/showdown/src/extensions/*.js',
10+
'bower_components/showdown/dist/showdown.js',
11+
'bower_components/showdown-twitter/dist/showdown-twitter.js',
1212
'markdown.js',
1313
'*.spec.js'
1414
],

markdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ angular.module('btford.markdown', ['ngSanitize']).
1414
opts = newOpts;
1515
},
1616
$get: function () {
17-
return new Showdown.converter(opts);
17+
return new showdown.Converter(opts);
1818
}
1919
};
2020
}).

0 commit comments

Comments
 (0)