Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

www/common/common-codemirror.js

@@ -158,10 +158,10 @@ define([
             });
 
             if ($rightside) { $rightside.append($block); }
-            cb();
+            if (cb) { cb(); }
         };
 
-        exp.configureTheme = function () {
+        exp.configureTheme = function (cb) {
             /*  Remember the user's last choice of theme using localStorage */
             var themeKey = 'CRYPTPAD_CODE_THEME';
             var lastTheme = localStorage.getItem(themeKey) || 'default';
@@ -195,6 +195,7 @@ define([
             });
 
             if ($rightside) { $rightside.append($block); }
+            if (cb) { cb(); }
         };
 
         exp.exportText = function () {

www/common/diffMarked.js

@@ -6,7 +6,7 @@ define([
     var DiffMd = {};
 
     var DiffDOM = window.diffDOM;
-    var renderer = DiffMd.renderer = new Marked.Renderer();
+    var renderer = new Marked.Renderer();
 
     Marked.setOptions({
         renderer: renderer
@@ -16,6 +16,24 @@ define([
         return Marked(md);
     };
 
+    // Tasks list
+    var checkedTaskItemPtn = /^\s*\[x\]\s*/;
+    var uncheckedTaskItemPtn = /^\s*\[ \]\s*/;
+    renderer.listitem = function (text) {
+        var isCheckedTaskItem = checkedTaskItemPtn.test(text);
+        var isUncheckedTaskItem = uncheckedTaskItemPtn.test(text);
+        if (isCheckedTaskItem) {
+            text = text.replace(checkedTaskItemPtn,
+                '<i class="fa fa-check-square" aria-hidden="true"></i>&nbsp;') + '\n';
+        }
+        if (isUncheckedTaskItem) {
+            text = text.replace(uncheckedTaskItemPtn,
+                '<i class="fa fa-square-o" aria-hidden="true"></i>&nbsp;') + '\n';
+        }
+        var cls = (isCheckedTaskItem || isUncheckedTaskItem) ? ' class="todo-list-item"' : '';
+        return '<li'+ cls + '>' + text + '</li>\n';
+    };
+
     var forbiddenTags = [
         'SCRIPT',
         'IFRAME',