Merge branch 'staging' into framework

2017-10-12 17:07:10 +03:00
parent c773b5d076 8e1f15e88d
commit 753e2d797e
21 changed files with 391 additions and 260 deletions
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -77,7 +77,7 @@ define([
        var c = Slide.content;
        var m = '<span class="cp-app-slide-container"><span class="'+slideClass+'">'+DiffMd.render(c).replace(separatorReg, '</span></span><span class="cp-app-slide-container"><span class="'+slideClass+'">')+'</span></span>';

-        DiffMd.apply(m, $content);
+        try { DiffMd.apply(m, $content); } catch (e) { return console.error(e); }

        var length = getNumberOfSlides();
        $modal.find('style.cp-app-slide-style').remove();