diff options
author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 14:00:50 +0100 |
---|---|---|
committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 14:00:50 +0100 |
commit | daa5f031bf7e6c221e836fe5cf98955f29094434 (patch) | |
tree | 2135e08b392a2a83ad961f797530c79b90b61974 | |
parent | 8ec529d7675392f7732612cd0e6566f2b0c4fac1 (diff) | |
parent | 43f0d081550e5a4a3bc86e478ecc145990ad9a40 (diff) | |
download | fosdem-2018-presentation-daa5f031bf7e6c221e836fe5cf98955f29094434.tar fosdem-2018-presentation-daa5f031bf7e6c221e836fe5cf98955f29094434.tar.gz |
Merge branch 'patch-2' of https://github.com/teawithfruit/reveal.js into dev
-rwxr-xr-x | plugin/markdown/markdown.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugin/markdown/markdown.js b/plugin/markdown/markdown.js index f4035e2..f40e2b6 100755 --- a/plugin/markdown/markdown.js +++ b/plugin/markdown/markdown.js @@ -4,7 +4,11 @@ * of external markdown documents. */ (function( root, factory ) { - if( typeof exports === 'object' ) { + if (typeof define === 'function' && define.amd) { + root.marked = require( './marked' ); + root.RevealMarkdown = factory( root.marked ); + root.RevealMarkdown.initialize(); + } else if( typeof exports === 'object' ) { module.exports = factory( require( './marked' ) ); } else { |