infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Display the file size before downloading it

pull/1/head
yflory 2017-06-15 16:30:50 +02:00
parent 594405de73
commit 5bfd8470cb
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
www/file/file.css
View File

@ -63,6 +63,19 @@ media-tag img {
height: 50vh;
box-sizing: border-box;
}
#download-form label {
display: flex;
justify-content: center;
align-items: center;
white-space: normal;
word-wrap: break-word;
}
#download-form label span {
width: 50vh;
max-width: 80vw;
text-align: center;
line-height: 1.5em;
}
.hovering {
background-color: rgba(255, 0, 115, 0.5) !important;
}
@ -92,5 +105,4 @@ body #uploadStatusContainer {
background-color: rgba(255, 255, 255, 0.9);
color: black;
opacity: 0.9;
display: block !important;
}

16
www/file/file.less
View File

@ -70,6 +70,21 @@ media-tag {
box-sizing: border-box;
}
}
#download-form {
label {
display: flex;
justify-content: center;
align-items: center;
white-space: normal;
word-wrap: break-word;
span {
width: 50vh;
max-width: 80vw;
text-align: center;
line-height: 1.5em;
}
}
}
.hovering {
background-color: rgba(255, 0, 115, 0.5) !important;
}
@ -111,5 +126,4 @@ body #uploadStatusContainer {
background-color: rgba(255, 255, 255, 0.9);
color: black;
opacity: 0.9;
display: block !important;
}

3
www/file/inner.html
View File

@ -18,8 +18,7 @@
</div>
<div id="download-form" style="display: none;">
<input type="button" name="dl" id="dl" class="inputfile" />
<label for="dl" class="btn btn-success block unselectable" data-localization-title="download_button"
data-localization="download_button"></label>
<label for="dl" class="btn btn-success block unselectable" data-localization-title="download_button"><span data-localization="download_button"></span></label>
<span class="block" id="progress"></span>
</div>
<div id="download-view" style="display: none;">

19
www/file/main.js
View File

@ -26,6 +26,7 @@ define([
var $dlform = $iframe.find('#download-form');
var $dlview = $iframe.find('#download-view');
var $label = $form.find('label');
var $dllabel = $dlform.find('label span');
var $progress = $iframe.find('#progress');
var $body = $iframe.find('body');
@ -60,13 +61,6 @@ define([
return data ? data.title : undefined;
};
var exportFile = function () {
var filename = Cryptpad.fixFileName(document.title);
if (!(typeof(filename) === 'string' && filename)) { return; }
var blob = new Blob([myFile], {type: myDataType});
saveAs(blob, filename);
};
Title = Cryptpad.createTitle({}, function(){}, Cryptpad);
var displayed = ['title', 'useradmin', 'newpad', 'limit', 'upgrade'];
@ -88,11 +82,6 @@ define([
if (uploadMode) { toolbar.title.hide(); }
var $rightside = toolbar.$rightside;
var $export = Cryptpad.createButton('export', true, {}, exportFile);
$rightside.append($export);
Title.updateTitle(Cryptpad.initialName || getTitle() || Title.defaultTitle);
if (!uploadMode) {
@ -123,7 +112,6 @@ define([
$appContainer.css('background', 'white');
}
$dlButton.addClass('btn btn-success');
Cryptpad.removeLoadingScreen();
})
.on('decryptionError', function (e) {
var error = e.originalEvent;
@ -167,6 +155,10 @@ define([
var todoBigFile = function (sizeMb) {
$dlform.show();
Cryptpad.removeLoadingScreen();
$dllabel.append($('<br>'));
$dllabel.append(metadata.name);
$dllabel.append($('<br>'));
$dllabel.append(Messages._getKey('formattedMB', [sizeMb]));
var decrypting = false;
var onClick = function (ev) {
if (decrypting) { return; }
@ -175,7 +167,6 @@ define([
displayFile(ev);
};
if (sizeMb < 5) { return void onClick(); }
Cryptpad.removeLoadingScreen();
$dlform.find('#dl, #progress').click(onClick);
};
Cryptpad.getFileSize(window.location.href, function (e, data) {