Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature 4378 #158

Merged
merged 2 commits into from
Nov 21, 2016
Merged

Feature 4378 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a5160
F #4378 Performed panel of options and data sample in the upload of i…
Nov 18, 2016
8dcabb7
Added possibility to remove the file after selecting this
Nov 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 101 additions & 12 deletions src/sunstone/public/app/tabs/images-tab/form-panels/create-common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ define(function(require) {
var Config = require('sunstone-config');
var WizardFields = require('utils/wizard-fields');
var ProgressBar = require('utils/progress-bar');
var Humanize = require('utils/humanize');

var TemplateWizardHTML = require('hbs!./create/wizard');
var TemplateAdvancedHTML = require('hbs!./create/advanced');
Expand Down Expand Up @@ -128,6 +129,7 @@ define(function(require) {
return false;
}


function _setup(context) {
var that = this;
Tips.setup(context);
Expand Down Expand Up @@ -287,33 +289,120 @@ define(function(require) {
fileName = file.fileName;
file_input = fileName;

$('#file-uploader-input', context).hide()
$('#file-uploader-input', context).hide();
$("#file-uploader-label", context).html(file.fileName);
$("#file-uploader-label", context).show();
$('#close_image', context).show();
});

$('#close_image', context).on('click', function(){
console.log("click");
$("#file-uploader-label", context).hide();
$('#close_image', context).hide();
$('#file-uploader-input', context).show();
fileName= '';
that.uploader.files.length = 0;
});

that.uploader.on('uploadStart', function() {
$('#upload_progress_bars').append(
'<div id="' + fileName + 'progressBar" class="row" style="margin-bottom:10px">\
<div id="' + fileName + '-info" class="medium-2 columns">\
' + Locale.tr("Uploading...") + '\
</div>\
<div class="medium-10 columns">\
<div class="progressbar">'+
ProgressBar.html(0, 1, fileName) + '\
var myThis = this;
if(!(myThis.progress() > 0)){
var element = $('#upload_progress_bars').append(
'<div id="' + fileName + 'progressBar" class="row" style="margin-bottom:10px">\
<div id="' + fileName + '-info" class="medium-2 columns">\
' + Locale.tr("Uploading...") + '\
</div>\
<div class="medium-10 columns">\
<div class="progressbar">'+
ProgressBar.html(0, 1, fileName) + '\
</div>\
<div>\
<button id="close_upload_image" class="fa fa-times-circle fa fa-lg close_upload_image"> </button>\
<button id="pause_upload_image" class="fa fa-pause fa fa-lg pause_upload_image"> </button>\
<button id="play_upload_image" class="fa fa-play fa fa-lg play_upload_image" hidden="true"> </button>\
</div>\
</div>\
</div>\
</div>');
<div class="medium-2 columns">\
<div id="speed">speed: </div>\
<div id="percent_progress">Completed: </div>\
</div>\
</div>');
}
checkUploadSpeed( 10, function ( speed) {
document.getElementById( 'speed' ).textContent = 'speed: ' + Humanize.size(speed) +'s';
}, element);
$(".close_upload_image").on('click', function(){
myThis.cancel();
show=0;
if(element)
element.remove();
});
$(".pause_upload_image").on('click', function(){
myThis.pause();
$(".pause_upload_image").hide();
$(".play_upload_image").show();
});
$(".play_upload_image").on('click', function(){
myThis.upload();
$(".play_upload_image").hide();
$(".pause_upload_image").show();
});

});

that.uploader.on('progress', function() {
document.getElementById( 'percent_progress' ).textContent = 'Completed: ' + (this.progress().toFixed(3)*100).toFixed(1) +'%';
$('div.progressbar', $('div[id="' + fileName + 'progressBar"]')).html(
ProgressBar.html(this.progress(), 1, fileName) );
});
}

return false;
}

function checkUploadSpeed( iterations, update, element) {
var index = 0,
timer = window.setInterval( check, 5000 ); //check every 5 seconds
check(element);

function check(element) {
if(!element){
window.clearInterval( timer );
}
else{
var xhr = new XMLHttpRequest(),
url = '?cache=' + Math.floor( Math.random() * 10000 ), //random number prevents url caching
data = getRandomString( 1 ), //1 meg POST size handled by all servers
startTime,
speed = 0;
xhr.onreadystatechange = function ( event ) {
if( xhr.readyState == 4 ) {
speed = Math.round( 1024 / ( ( new Date() - startTime ) / 1000 ) );
update( speed );
index++;
if( index == iterations ) {
window.clearInterval( timer );
};
};
};
xhr.open( 'POST', url, true );
startTime = new Date();
if(xhr && data)
xhr.send( data );
}
};

function getRandomString( sizeInMb ) {
var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789~!@#$%^&*()_+`-=[]\{}|;':,./<>?", //random data prevents gzip effect
iterations = sizeInMb * 1024 * 1024, //get byte count
result = '';
for( var index = 0; index < iterations; index++ ) {
result += chars.charAt( Math.floor( Math.random() * chars.length ) );
};
return result;
};
};

function _submitWizard(context) {
var that = this;
var upload = false;
Expand Down
1 change: 1 addition & 0 deletions src/sunstone/public/app/tabs/images-tab/form-panels/create/wizard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
<div class="row">
<div id="file-uploader" class="large-12 columns text-center">
<label id="file-uploader-label" for="file-uploader-input"></label>
<i id="close_image" class="fa fa-times-circle fa fa-lg close_image" hidden="true"></i>
<input id="file-uploader-input" type="file"/>
</div>
</div>
Expand Down