Merge pull request #252 from mozilla/ui
only allow drag and drop on upload page
This commit is contained in:
commit
1992626da8
@ -93,6 +93,8 @@ $(document).ready(function() {
|
|||||||
$('#page-one').hide();
|
$('#page-one').hide();
|
||||||
$('#upload-error').hide();
|
$('#upload-error').hide();
|
||||||
$('#upload-progress').show();
|
$('#upload-progress').show();
|
||||||
|
//don't allow drag and drop when not on page-one
|
||||||
|
$('body').off('drop', onUpload);
|
||||||
const percent = progress[0] / progress[1];
|
const percent = progress[0] / progress[1];
|
||||||
// update progress bar
|
// update progress bar
|
||||||
$('#ul-progress').circleProgress('value', percent);
|
$('#ul-progress').circleProgress('value', percent);
|
||||||
@ -101,21 +103,15 @@ $(document).ready(function() {
|
|||||||
});
|
});
|
||||||
if (progress[1] < 1000000) {
|
if (progress[1] < 1000000) {
|
||||||
$('.progress-text').text(
|
$('.progress-text').text(
|
||||||
`${file.name} (${(progress[0] / 1000).toFixed(
|
`${file.name} (${(progress[0] / 1000).toFixed(1)}KB of ${(progress[1] / 1000).toFixed(1)}KB)`
|
||||||
1
|
|
||||||
)}KB of ${(progress[1] / 1000).toFixed(1)}KB)`
|
|
||||||
);
|
);
|
||||||
} else if (progress[1] < 1000000000) {
|
} else if (progress[1] < 1000000000) {
|
||||||
$('.progress-text').text(
|
$('.progress-text').text(
|
||||||
`${file.name} (${(progress[0] / 1000000).toFixed(
|
`${file.name} (${(progress[0] / 1000000).toFixed(1)}MB of ${(progress[1] / 1000000).toFixed(1)}MB)`
|
||||||
1
|
|
||||||
)}MB of ${(progress[1] / 1000000).toFixed(1)}MB)`
|
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$('.progress-text').text(
|
$('.progress-text').text(
|
||||||
`${file.name} (${(progress[0] / 1000000).toFixed(
|
`${file.name} (${(progress[0] / 1000000).toFixed(1)}MB of ${(progress[1] / 1000000000).toFixed(1)}GB)`
|
||||||
1
|
|
||||||
)}MB of ${(progress[1] / 1000000000).toFixed(1)}GB)`
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user