diff --git a/bower.json b/bower.json index 39d225753..66b20fdaf 100644 --- a/bower.json +++ b/bower.json @@ -55,7 +55,8 @@ "list.js": "^1.2.0", "store-js": "store.js#^1.3.20", "string": "^3.3.1", - "visibilityjs": "^1.2.3" + "visibilityjs": "^1.2.3", + "pdfobject": "pdfobject2#*" }, "resolutions": { "jquery": "~2.2.4" diff --git a/public/docs/features.md b/public/docs/features.md index 1aa3c220a..07e7d669d 100644 --- a/public/docs/features.md +++ b/public/docs/features.md @@ -186,6 +186,10 @@ alert(s); ### Speakerdeck {%speakerdeck sugarenia/xxlcss-how-to-scale-css-and-keep-your-sanity %} +### PDF +**Caution: this might be blocked by your browser if not using https url.** +{%pdf https://papers.nips.cc/paper/5346-sequence-to-sequence-learning-with-neural-networks.pdf %} + ## MathJax You can render *LaTeX* mathematical expressions using **MathJax**, as on [math.stackexchange.com](http://math.stackexchange.com/): diff --git a/public/js/extra.js b/public/js/extra.js index e67eee533..b30a8cb0e 100644 --- a/public/js/extra.js +++ b/public/js/extra.js @@ -83,6 +83,20 @@ function slugifyWithUTF8(text) { return newText; } +function isValidURL(str) { + var pattern = new RegExp('^(https?:\\/\\/)?' + // protocol + '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name + '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address + '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path + '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string + '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator + if (!pattern.test(str)) { + return false; + } else { + return true; + } +} + //parse meta function parseMeta(md, edit, view, toc, tocAffix) { var lang = null; @@ -403,6 +417,16 @@ function finishView(view) { } }); }); + //pdf + view.find(".pdf.raw").removeClass("raw") + .each(function (key, value) { + var url = $(value).attr('data-pdfurl'); + var inner = $('
'); + $(this).append(inner); + PDFObject.embed(url, inner, { + height: '400px' + }); + }); //render title document.title = renderTitle(view); } @@ -901,6 +925,20 @@ var speakerdeckPlugin = new Plugin( return div[0].outerHTML; } ); +//pdf +var pdfPlugin = new Plugin( + // regexp to match + /{%pdf\s*([\d\D]*?)\s*%}/, + + // this function will be called when something matches + function (match, utils) { + var pdfurl = match[1]; + if (!isValidURL(pdfurl)) return match[0]; + var div = $(''); + div.attr('data-pdfurl', pdfurl); + return div[0].outerHTML; + } +); //yaml meta, from https://github.com/eugeneware/remarkable-meta function get(state, line) { @@ -949,4 +987,5 @@ md.use(vimeoPlugin); md.use(gistPlugin); md.use(tocPlugin); md.use(slidesharePlugin); -md.use(speakerdeckPlugin); \ No newline at end of file +md.use(speakerdeckPlugin); +md.use(pdfPlugin); \ No newline at end of file diff --git a/public/js/index.js b/public/js/index.js index dc5f928c7..43296af43 100644 --- a/public/js/index.js +++ b/public/js/index.js @@ -152,6 +152,10 @@ var supportExternals = [ { text: '{%speakerdeck speakerdeckid %}', search: 'speakerdeck' + }, + { + text: '{%pdf pdfurl %}', + search: 'pdf' } ]; var supportExtraTags = [ @@ -1836,20 +1840,6 @@ function importFromUrl(url) { }); } -function isValidURL(str) { - var pattern = new RegExp('^(https?:\\/\\/)?' + // protocol - '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // domain name - '((\\d{1,3}\\.){3}\\d{1,3}))' + // OR ip (v4) address - '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // port and path - '(\\?[;&a-z\\d%_.~+=-]*)?' + // query string - '(\\#[-a-z\\d_]*)?$', 'i'); // fragment locator - if (!pattern.test(str)) { - return false; - } else { - return true; - } -} - //mode ui.toolbar.mode.click(function () { toggleMode(); diff --git a/public/views/foot.ejs b/public/views/foot.ejs index cb53acb10..4b8a566f8 100644 --- a/public/views/foot.ejs +++ b/public/views/foot.ejs @@ -59,6 +59,7 @@ + diff --git a/public/views/pretty.ejs b/public/views/pretty.ejs index 5ba2e8e1c..7a3b96b73 100644 --- a/public/views/pretty.ejs +++ b/public/views/pretty.ejs @@ -116,6 +116,7 @@ +