[\s\S]*?<\/pre>/gim, function (x) {
+ var hash = hashId();
+ preExtractions[hash] = x;
+ return '{gfm-js-extract-pre-' + hash + '}';
+ }, 'm');
+
+ // Extract code blocks
+ text = text.replace(/[\s\S]*?<\/code>/gim, function (x) {
+ var hash = hashId();
+ codeExtractions[hash] = x;
+ return '{gfm-js-extract-code-' + hash + '}';
+ }, 'm');
+
+ text = text.replace(highlightRegex, function (match, n, content) {
+ // Check the content isn't just an `=`
+ if (!/^=+$/.test(content)) {
+ return '' + content + '';
+ }
+
+ return match;
+ });
+
+ // replace pre extractions
+ text = text.replace(/\{gfm-js-extract-pre-([0-9]+)\}/gm, function (x, y) {
+ return preExtractions[y];
+ });
+
+ // replace code extractions
+ text = text.replace(/\{gfm-js-extract-code-([0-9]+)\}/gm, function (x, y) {
+ return codeExtractions[y];
+ });
+
+ return text;
+ }
+ }
+ ];
+ };
+
+ // Client-side export
+ if (typeof window !== 'undefined' && window.Showdown && window.Showdown.extensions) {
+ window.Showdown.extensions.highlight = highlight;
+ }
+ // Server-side export
+ if (typeof module !== 'undefined') {
+ module.exports = highlight;
+ }
+}());
diff --git a/core/test/unit/showdown_client_integrated_spec.js b/core/test/unit/showdown_client_integrated_spec.js
index 04f180896c..023fe22589 100644
--- a/core/test/unit/showdown_client_integrated_spec.js
+++ b/core/test/unit/showdown_client_integrated_spec.js
@@ -12,9 +12,10 @@ var should = require('should'),
Showdown = require('showdown-ghost'),
ghostgfm = require('../../shared/lib/showdown/extensions/ghostgfm'),
ghostimagepreview = require('../../shared/lib/showdown/extensions/ghostimagepreview'),
- ghostfootnotes = require('../../shared/lib/showdown/extensions/ghostfootnotes'),
+ footnotes = require('../../shared/lib/showdown/extensions/ghostfootnotes'),
+ highlight = require('../../shared/lib/showdown/extensions/ghosthighlight'),
- converter = new Showdown.converter({extensions: [ghostimagepreview, ghostgfm, ghostfootnotes]});
+ converter = new Showdown.converter({extensions: [ghostimagepreview, ghostgfm, footnotes, highlight]});
// To stop jshint complaining
should.equal(true, true);
@@ -532,6 +533,95 @@ describe('Showdown client side converter', function () {
});
});
+ it('should replace showdown highlight with html', function () {
+ var testPhrases = [
+ {
+ input: '==foo_bar==',
+ output: /^foo_bar<\/mark><\/p>$/
+ },
+ {
+ input: 'My stuff that has a ==highlight== in the middle.',
+ output: /^My stuff that has a highlight<\/mark> in the middle.<\/p>$/
+ },
+ {
+ input: 'My stuff that has a ==multiple word highlight== in the middle.',
+ output: /^My stuff that has a multiple word highlight<\/mark> in the middle.<\/p>$/
+ },
+ {
+ input: 'My stuff that has a ==multiple word **bold** highlight== in the middle.',
+ output: /^My stuff that has a multiple word bold<\/strong> highlight<\/mark> in the middle.<\/p>$/
+ },
+ {
+ input: 'My stuff that has a ==multiple word and\n line broken highlight== in the middle.',
+ output: /^My stuff that has a multiple word and
\n line broken highlight<\/mark> in the middle.<\/p>$/
+ },
+ {
+ input: 'Test ==Highlighting with a [link](https://ghost.org) in the middle== of it.',
+ output: /^Test Highlighting with a link<\/a> in the middle<\/mark> of it.<\/p>$/
+ },
+ {
+ input: '==[link](http://ghost.org)==',
+ output: /^link<\/a><\/mark><\/p>$/
+ },
+ {
+ input: '[==link==](http://ghost.org)',
+ output: /^