From efedfe0667e7d1cabf046ecaf887c78414996c6f Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 3 Jul 2017 14:53:50 +0200 Subject: [PATCH 1/3] show preview pane by default in /slide/ --- www/slide/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/slide/main.js b/www/slide/main.js index 0b03f292c..9148b73ed 100644 --- a/www/slide/main.js +++ b/www/slide/main.js @@ -590,7 +590,7 @@ define([ Cryptpad.getPadAttribute('previewMode', function (e, data) { if (e) { return void console.error(e); } - if (data === true && APP.$previewButton) { + if ([true, undefined].indexOf(data) !== -1 && APP.$previewButton) { APP.$previewButton.click(); } }); From 708d5ae35fa5889cf79fcac0840b55b5922edb78 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 3 Jul 2017 16:43:49 +0200 Subject: [PATCH 2/3] remove noisy log calls --- rpc.js | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/rpc.js b/rpc.js index 2260c2c53..3a97dc80d 100644 --- a/rpc.js +++ b/rpc.js @@ -872,28 +872,17 @@ RPC.create = function (config /*:typeof(ConfigType)*/, cb /*:(?Error, ?Function) var blobStagingPath = paths.staging = keyOrDefaultString('blobStagingPath', './blobstage'); var isUnauthenticateMessage = function (msg) { - var unAuthed = msg && msg.length === 2 && isUnauthenticatedCall(msg[0]); - - if (unAuthed) { - console.log(msg); - console.log('is unauthenticated call!'); - return unAuthed; - } else { - return false; - } + return msg && msg.length === 2 && isUnauthenticatedCall(msg[0]); }; var handleUnauthenticatedMessage = function (msg, respond) { - console.log(msg); switch (msg[0]) { case 'GET_FILE_SIZE': - console.log("Get file size"); return void getFileSize(Env, msg[1], function (e, size) { if (e) { console.error(e); } WARN(e, msg[1]); - console.log(size); respond(e, [null, size, null]); }); case 'GET_MULTIPLE_FILE_SIZE': From 92d88d1644976f47bc904327f3bd168d75e4e83a Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 3 Jul 2017 16:45:40 +0200 Subject: [PATCH 3/3] don't change allowed media types until we have media-tag scoping --- www/common/cryptpad-common.js | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index e1743b89c..b0d6ea424 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -1235,7 +1235,6 @@ define([ $img.attr('src', src); $img.attr('data-crypto-key', 'cryptpad:' + cryptKey); require(['/common/media-tag.js'], function (MediaTag) { - MediaTag.CryptoFilter.setAllowedMediaTypes(common.avatarAllowedTypes); MediaTag($img[0]); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(mutation) {