From d3fdb0d9fe1d1a0ab828544bec301342d9aec25e Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 27 Aug 2019 15:37:45 +0200 Subject: [PATCH 1/3] Fix fileHost error --- www/common/sframe-app-framework.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/sframe-app-framework.js b/www/common/sframe-app-framework.js index d4df1abbe..84e73db01 100644 --- a/www/common/sframe-app-framework.js +++ b/www/common/sframe-app-framework.js @@ -465,7 +465,7 @@ define([ if (data.type !== 'file') { console.log('unhandled embed type ' + data.type); return; } var privateDat = cpNfInner.metadataMgr.getPrivateData(); 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($(''), data); } From b88c5d29443cd14fe3a86577e53a05256c75572a Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 27 Aug 2019 15:56:27 +0200 Subject: [PATCH 2/3] Fix notifications --- www/common/sframe-common-mailbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/www/common/sframe-common-mailbox.js b/www/common/sframe-common-mailbox.js index 2d0596b40..5aaaa5340 100644 --- a/www/common/sframe-common-mailbox.js +++ b/www/common/sframe-common-mailbox.js @@ -57,11 +57,11 @@ define([ $(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") .click(data.content.handler); } - if (typeof(data.content.isDismissible) === "function") { + if (data.content.isDismissible) { var dismissIcon = h('span.fa.fa-times'); var dismiss = h('div.cp-notification-dismiss', { title: Messages.notifications_dismiss From 7510e7319e85c6795d1db1e81d2007fabc7f6698 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 27 Aug 2019 16:07:40 +0200 Subject: [PATCH 3/3] Fix dropping files into codemirror --- www/common/sframe-common-codemirror.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js index 60940b470..7422c91f1 100644 --- a/www/common/sframe-common-codemirror.js +++ b/www/common/sframe-common-codemirror.js @@ -145,6 +145,7 @@ define([ }; var editor = exp.editor = CMeditor.fromTextArea($textarea[0], { + allowDropFileTypes: [], lineNumbers: true, lineWrapping: true, autoCloseBrackets: true,