diff --git a/demo/assets/index.css b/demo/assets/index.css index 610b68a..4ef78cc 100644 --- a/demo/assets/index.css +++ b/demo/assets/index.css @@ -127,3 +127,19 @@ body { padding: 4px 50px 2px; text-align: center; } +.form-inline .radio, +.form-inline .checkbox { + display: inline-block; + margin-bottom: 0; + margin-top: 0; +} +.form-inline .form-group { + display: inline-block; + margin-bottom: 0; + vertical-align: middle; +} +.form-inline .form-control { + display: inline-block; + vertical-align: middle; + width: auto; +} diff --git a/demo/assets/index.js b/demo/assets/index.js index 3fa4a95..e03f80e 100644 --- a/demo/assets/index.js +++ b/demo/assets/index.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - var mdHtml, mdSrc, permalink, scrollMap; + var mdHtml, mdSrc, permalink, scrollMap, escapeHtml; var defaults = { html: false, // Enable HTML tags in source @@ -18,7 +18,7 @@ }; defaults.highlight = function (str, lang) { - if (!defaults._highlight) { return ''; } + if (!defaults._highlight || !window.hljs) { return ''; } var hljs = window.hljs; if (lang && hljs.getLanguage(lang)) { @@ -92,16 +92,17 @@ function updateResult() { var source = $('.source').val(), - dump; + out; // Update only active view to avoid slowdowns // (debug & src view with highlighting are a bit slow) if (defaults._view === 'src') { - $('.result-src-content').html(window.hljs.highlight('html', mdSrc.render(source)).value); + out = mdSrc.render(source); + $('.result-src-content').html(window.hljs ? window.hljs.highlight('html', out).value : escapeHtml(out)); } else if (defaults._view === 'debug') { - dump = JSON.stringify(mdSrc.parse(source, { references: {} }), null, 2); - $('.result-debug-content').html(window.hljs.highlight('json', dump).value); + out = JSON.stringify(mdSrc.parse(source, { references: {} }), null, 2); + $('.result-debug-content').html(window.hljs ? window.hljs.highlight('json', out).value : escapeHtml(out)); } else { /*defaults._view === 'html'*/ $('.result-html').html(mdHtml.render(source)); @@ -212,10 +213,14 @@ } $(function() { + escapeHtml = window.Remarkable.utils.escapeHtml; + // highlight snippet - $('pre.code-sample code').each(function(i, block) { - window.hljs.highlightBlock(block); - }); + if (window.hljs) { + $('pre.code-sample code').each(function(i, block) { + window.hljs.highlightBlock(block); + }); + } // Restore content if opened by permalink if (location.hash && /^(#md=|#md64=)/.test(location.hash)) { diff --git a/demo/index.html b/demo/index.html index 65ae404..425cdae 100644 --- a/demo/index.html +++ b/demo/index.html @@ -3,15 +3,23 @@ Remarkable demo - + + + + - - - + + + + +