infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
ansuz 2017-06-14 11:10:26 +02:00
parent 69c3bd392f 494b44e2b1
commit 687b4d8307
3 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-file.js
View File

@ -37,7 +37,9 @@ define([
data.name = file.metadata.name;
data.url = href;
data.mediatag = true;
if (file.metadata.type.slice(0,6) === 'image/') {
data.mediatag = true;
}
return data;
};

24
www/common/diffMarked.js
View File

@ -82,29 +82,6 @@ define([
}
};
var getSubMediaTag = function (element) {
var result = [];
console.log(element);
if (element.nodeName === "MEDIA-TAG") {
result.push(element);
return result;
}
if (element.childNodes) {
element.childNodes.forEach(function (el) {
result = result.concat(getSubMediaTag(el, result));
});
}
console.log(result);
return result;
};
var mediaTag = function (info) {
if (info.diff.action === 'addElement') {
return getSubMediaTag(info.diff.element);
//MediaTag.CryptoFilter.setAllowedMediaTypes(allowedMediaTypes);
//MediaTag($mt[0]);
}
return;
};
var slice = function (coll) {
return Array.prototype.slice.call(coll);
@ -127,7 +104,6 @@ define([
return Dom;
};
//var toTransform = [];
var DD = new DiffDOM({
preDiffApply: function (info) {
if (unsafeTag(info)) { return true; }

6
www/slide/main.js
View File

@ -531,16 +531,16 @@ define([
};
var cursor = editor.coordsChar(obj);
*/
var cursor = editor.getCursor();
//var cursor = editor.getCursor();
var cleanName = data.name.replace(/[\[\]]/g, '');
var text = '['+cleanName+']('+data.url+')';
if (data.mediatag) {
var text = '!['+cleanName+']('+data.url+')';
text = '!'+text;
}
editor.replaceSelection(text);
}
};
var FM = Cryptpad.createFileManager(fmConfig);
Cryptpad.createFileManager(fmConfig);
};
config.onRemote = function () {