Merge branch 'master' into addEditorThemes-#362

shared/naturalcrit/codeEditor/codeEditor.jsx

@@ -102,11 +102,14 @@ const CodeEditor = createClass({
 		this.codeMirror = CodeMirror(this.refs.editor, {
 			lineNumbers       : true,
 			lineWrapping      : this.props.wrap,
-			indentWithTabs    : true,
+			indentWithTabs    : false,
 			tabSize           : 2,
+			smartIndent       : false,
 			historyEventDelay : 250,
 			scrollPastEnd     : true,
 			extraKeys         : {
+				'Tab'              : this.indent,
+				'Shift-Tab'        : this.dedent,
 				'Ctrl-B'           : this.makeBold,
 				'Cmd-B'            : this.makeBold,
 				'Ctrl-I'           : this.makeItalic,
@@ -177,6 +180,19 @@ const CodeEditor = createClass({
 		this.updateSize();
 	},
 
+	indent : function () {
+		const cm = this.codeMirror;
+		if (cm.somethingSelected()) {
+			cm.execCommand('indentMore');
+		} else {
+			cm.execCommand('insertSoftTab');
+		}
+	},
+
+	dedent : function () {
+		this.codeMirror.execCommand('indentLess');
+	},
+
 	makeHeader : function (number) {
 		const selection = this.codeMirror.getSelection();
 		const header = Array(number).fill('#').join('');

shared/naturalcrit/markdown.js

@@ -2,6 +2,7 @@
 const _ = require('lodash');
 const Marked = require('marked');
 const MarkedExtendedTables = require('marked-extended-tables');
+const { gfmHeadingId: MarkedGFMHeadingId } = require('marked-gfm-heading-id');
 const renderer = new Marked.Renderer();
 
 //Processes the markdown within an HTML block if it's just a class-wrapper
@@ -236,10 +237,49 @@ const definitionLists = {
 	}
 };
 
+const MarkedSmartyPantsLite = ()=>{
+	return {
+		tokenizer : {
+			inlineText(src) {
+				// don't escape inlineText
+				const cap = this.rules.inline.text.exec(src);
+
+				/* istanbul ignore next */
+				if(!cap) {
+					// should never happen
+					return;
+				}
+
+				const text = cap[0]
+					// em-dashes
+					.replace(/---/g, '\u2014')
+					// en-dashes
+					.replace(/--/g, '\u2013')
+					// opening singles
+					.replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
+					// closing singles & apostrophes
+					.replace(/'/g, '\u2019')
+					// opening doubles
+					.replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
+					// closing doubles
+					.replace(/"/g, '\u201d')
+					// ellipses
+					.replace(/\.{3}/g, '\u2026');
+
+				return {
+					type : 'text',
+					raw  : cap[0],
+					text : text
+				};
+			}
+		}
+	};
+};
+
 Marked.use({ extensions: [mustacheSpans, mustacheDivs, mustacheInjectInline, definitionLists] });
-Marked.use(MarkedExtendedTables());
 Marked.use(mustacheInjectBlock);
-Marked.use({ renderer: renderer, smartypants: true });
+Marked.use({ renderer: renderer, mangle: false });
+Marked.use(MarkedExtendedTables(), MarkedGFMHeadingId(), MarkedSmartyPantsLite());
 
 //Fix local links in the Preview iFrame to link inside the frame
 renderer.link = function (href, title, text) {