Removing bundle and reworking

Instead of bundling up assets, serve the smaller ones.
Larger ones can be loaded from cdn.

Author: AddisonSchiller

mfr/extensions/md/README.md

@@ -0,0 +1,43 @@
+
+## Markdown plus Mathjax readme
+
+Most of the packages are in there to try to match what the OSF wiki is doing. The two exceptions being markdown-it-highlightjs.js and markdown-it-mathjax.js. The highlighter matches the functionality of what is on the osf however, and the markdown-it-mathjax.js increases functionality with mathjax. 
+
+to get all the libraries needed:
+
+```
+npm [email protected]
+npm install @centerforopenscience/[email protected]
+npm install [email protected]
+npm install [email protected]
+npm install [email protected]
+npm install [email protected]
+```
+
+To add a new library, you need to make sure its loadable in md.js somehow, either through exporting via `root.<name>` or some other means. Some of the markdown plugins added have custom code in them to load them into `root`.
+
+Libraries should try to use the same version as the ones used on the OSF. The plugins do not matter as much, but `markdown-it` and `Mathjax` you should try to match exactly because styling can change between versions.
+
+To add a new library that is not already set up to export to `root` can be a bit tricky, but the gist of it is, wrap the plugin in this code:
+
+```
+;(function (root, factory) {
+  if (typeof exports === 'object') {
+    module.exports = factory()
+  } else {
+    root.<PLUGIN_NAME> = factory()
+  }
+})(this, function () {
+
+
+return function(md){
+
+    .....
+}
+
+})
+```
+
+And then modify it to work in this context. See other plugins for examples.
+
+Then, in md.js, you can add a plugin to the markdown renderer by adding a `.use(<window.<PLUGIN_NAME>)`

mfr/extensions/md/render.py

@@ -1,20 +1,11 @@
 import os
 
 import bleach
-# import markdown
-# from markdown.extensions import Extension
-
 from mako.lookup import TemplateLookup
 
 from mfr.core import extension
 
 
-# class EscapeHtml(Extension):
-#     def extendMarkdown(self, md, md_globals):
-#         del md.preprocessors['html_block']
-#         del md.inlinePatterns['html']
-
-
 class MdRenderer(extension.BaseRenderer):
 
     TEMPLATE = TemplateLookup(
@@ -24,12 +15,11 @@ class MdRenderer(extension.BaseRenderer):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        # self.metrics.add('markdown_version', markdown.version)
 
     def render(self):
         """Render a markdown file to html."""
         with open(self.file_path, 'r') as fp:
-            body = bleach.clean(fp.read())
+            body = fp.read()
             return self.TEMPLATE.render(base=self.assets_url, body=body)
 
     @property

mfr/extensions/md/static/css/default.css

@@ -0,0 +1,43 @@
+@charset "utf-8";
+
+/**
+ * markdown.css
+ *
+ * Found on github at https://github.com/jasonm23/markdown-css-themes
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see http://gnu.org/licenses/lgpl.txt.
+ *
+ * @project      Weblog and Open Source Projects of Florian Wolters
+ * @version      GIT: $Id$
+ * @package      xhtml-css
+ * @author       Florian Wolters <[email protected]>
+ * @copyright    2012 Florian Wolters
+ * @cssdoc       version 1.0-pre
+ * @license      http://gnu.org/licenses/lgpl.txt GNU Lesser General Public License
+ * @link         http://github.com/FlorianWolters/jekyll-bootstrap-theme
+ * @media        all
+ * @valid        true
+ */
+
+
+
+
+.mfrViewer {
+    font-family: 'Open Sans';
+    padding:1em;
+    background:#fefefe;
+    height: auto;
+    word-wrap: break-word;
+}
+

mfr/server/static/css/highlightjs-default.css renamed to mfr/extensions/md/static/css/highlightjs-default.css

@@ -0,0 +1,50 @@
+;(function (root, factory) {
+  if (typeof exports === 'object') {
+    module.exports = factory()
+  } else {
+    root.markdownitHightlightjs = factory()
+  }
+})(this, function () {
+
+const maybe = f => {
+  try {
+    return f()
+  } catch (e) {
+    return false
+  }
+}
+
+// Highlight with given language.
+const highlight = (code, lang) =>
+  maybe(() => hljs.highlight(lang, code, true).value) || ''
+
+// Highlight with given language or automatically.
+const highlightAuto = (code, lang) =>
+  lang
+    ? highlight(code, lang)
+    : maybe(() => hljs.highlightAuto(code).value) || ''
+
+// Wrap a render function to add `hljs` class to code blocks.
+const wrap = render =>
+  function (...args) {
+    return render.apply(this, args)
+      .replace('<code class="', '<code class="hljs ')
+      .replace('<code>', '<code class="hljs">')
+  }
+  var defaults = {
+    auto: true,
+    code: true
+  }
+
+  return function(md, opts){
+    opts = Object.assign({}, defaults, opts)
+
+    md.options.highlight = opts.auto ? highlightAuto : highlight
+    md.renderer.rules.fence = wrap(md.renderer.rules.fence)
+
+    if (opts.code) {
+      md.renderer.rules.code_block = wrap(md.renderer.rules.code_block)
+    }
+  }
+
+})