web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
ansuz 2019-08-27 17:08:35 +02:00
commit 6fbfa2beea
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/sframe-app-framework.js
View File

@ -465,7 +465,7 @@ define([
if (data.type !== 'file') { console.log('unhandled embed type ' + data.type); return; } if (data.type !== 'file') { console.log('unhandled embed type ' + data.type); return; }
var privateDat = cpNfInner.metadataMgr.getPrivateData(); var privateDat = cpNfInner.metadataMgr.getPrivateData();
var origin = privateDat.fileHost || privateDat.origin; var origin = privateDat.fileHost || privateDat.origin;
var src = data.src = data.src.slice(0,1) === '/' ? data.src : origin + data.src; var src = data.src = data.src.slice(0,1) === '/' ? origin + data.src : data.src;
mediaTagEmbedder($('<media-tag src="' + src + mediaTagEmbedder($('<media-tag src="' + src +
'" data-crypto-key="cryptpad:' + data.key + '"></media-tag>'), data); '" data-crypto-key="cryptpad:' + data.key + '"></media-tag>'), data);
} }

1
www/common/sframe-common-codemirror.js
View File

@ -145,6 +145,7 @@ define([
}; };
var editor = exp.editor = CMeditor.fromTextArea($textarea[0], { var editor = exp.editor = CMeditor.fromTextArea($textarea[0], {
allowDropFileTypes: [],
lineNumbers: true, lineNumbers: true,
lineWrapping: true, lineWrapping: true,
autoCloseBrackets: true, autoCloseBrackets: true,

4
www/common/sframe-common-mailbox.js
View File

@ -57,11 +57,11 @@ define([
$(notif).find('.cp-notification-content p').html(data.content.getFormatText()); $(notif).find('.cp-notification-content p').html(data.content.getFormatText());
} }
if (typeof(data.content.isClickable) === "function") { if (data.content.isClickable) {
$(notif).find('.cp-notification-content').addClass("cp-clickable") $(notif).find('.cp-notification-content').addClass("cp-clickable")
.click(data.content.handler); .click(data.content.handler);
} }
if (typeof(data.content.isDismissible) === "function") { if (data.content.isDismissible) {
var dismissIcon = h('span.fa.fa-times'); var dismissIcon = h('span.fa.fa-times');
var dismiss = h('div.cp-notification-dismiss', { var dismiss = h('div.cp-notification-dismiss', {
title: Messages.notifications_dismiss title: Messages.notifications_dismiss