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

Update UI for the file/media app

Browse Source
This commit is contained in:
yflory
2017-06-15 15:35:52 +02:00
parent c2c04bd5d8
commit cbe21959b4
5 changed files with 82 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
www/file/main.js
View File

@@ -21,6 +21,7 @@ define([
var andThen = function () {
var ifrw = $('#pad-iframe')[0].contentWindow;
var $iframe = $('#pad-iframe').contents();
var $appContainer = $iframe.find('#app');
var $form = $iframe.find('#upload-form');
var $dlform = $iframe.find('#download-form');
var $dlview = $iframe.find('#download-view');
@@ -116,10 +117,12 @@ define([
if (decrypted.callback) { decrypted.callback(); }
$dlview.show();
$dlform.hide();
if (ev) {
var $dlButton = $dlview.find('media-tag button');
$dlButton.click();
var $dlButton = $dlview.find('media-tag button');
if (ev) { $dlButton.click(); }
if (!$dlButton.length) {
$appContainer.css('background', 'white');
}
$dlButton.addClass('btn btn-success');
Cryptpad.removeLoadingScreen();
})
.on('decryptionError', function (e) {
@@ -165,11 +168,11 @@ define([
$dlform.show();
Cryptpad.removeLoadingScreen();
var decrypting = false;
var onClick = function () {
var onClick = function (ev) {
if (decrypting) { return; }
if (myFile) { return void exportFile(); }
decrypting = true;
displayFile();
displayFile(ev);
};
if (sizeMb < 5) { return void onClick(); }
Cryptpad.removeLoadingScreen();
@@ -200,7 +203,8 @@ define([
var fmConfig = {
dropArea: $form,
hoverArea: $label,
body: $body
body: $body,
keepTable: true // Don't fadeOut the tbale with the uploaded files
};
var FM = Cryptpad.createFileManager(fmConfig);