From 1d7683503f88ee08efe683545e4405ee725b78e7 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 25 Sep 2017 12:44:05 +0200 Subject: [PATCH] Fix link origin in sframe upload table --- customize.dist/src/less2/include/fileupload.less | 5 +++++ www/common/sframe-common-file.js | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/customize.dist/src/less2/include/fileupload.less b/customize.dist/src/less2/include/fileupload.less index bd90ab5d3..a07d365bd 100644 --- a/customize.dist/src/less2/include/fileupload.less +++ b/customize.dist/src/less2/include/fileupload.less @@ -28,6 +28,11 @@ td { padding: @upload_pad_h @upload_pad_v; } + .cp-fileupload-table-link { + .fa { + margin-right: 5px; + } + } .cp-fileupload-table-progress { width: 200px; position: relative; diff --git a/www/common/sframe-common-file.js b/www/common/sframe-common-file.js index 8093db836..10bb8fbac 100644 --- a/www/common/sframe-common-file.js +++ b/www/common/sframe-common-file.js @@ -51,9 +51,7 @@ define([ $('').text(Messages.cancel).appendTo($thead); var createTableContainer = function ($body) { - console.log($body); File.$container = $('
', { id: 'cp-fileupload' }).append($table).appendTo($body); - console.log('done'); return File.$container; }; @@ -114,10 +112,13 @@ define([ }; onComplete = function (href) { + var mdMgr = common.getMetadataMgr(); + var origin = mdMgr.getPrivateData().origin; + $link.prepend($('', {'class': 'fa fa-external-link'})); $link.attr('href', href) .click(function (e) { e.preventDefault(); - window.open($link.attr('href'), '_blank'); + window.open(origin + $link.attr('href'), '_blank'); }); var title = metadata.name; Cryptpad.log(Messages._getKey('upload_success', [title]));