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

This commit is contained in:
yflory
2017-05-18 14:57:12 +02:00
11 changed files with 14 additions and 14 deletions

View File

@@ -3,7 +3,7 @@ define([
'/bower_components/marked/marked.min.js',
'/bower_components/diff-dom/diffDOM.js'
],function ($, Marked) {
var DiffMd = {}
var DiffMd = {};
var DiffDOM = window.diffDOM;
var renderer = new Marked.Renderer();
@@ -108,7 +108,7 @@ define([
return patch;
};
var apply = DiffMd.apply = function (newHtml, $content) {
DiffMd.apply = function (newHtml, $content) {
var id = $content.attr('id');
if (!id) { throw new Error("The element must have a valid id"); }
var $div = $('<div>', {id: id}).append(newHtml);