Skip to content

Commit

Permalink
dev: FUQT can now handle more than 2 files if limit is set to 10, ple…
Browse files Browse the repository at this point in the history
…ase check and correct if there is a better way to ensure values are treated as integers

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@10317 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
mennodekker committed Jun 21, 2011
1 parent 90c4445 commit a1fb529
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions scripts/uploader.js
Expand Up @@ -62,8 +62,8 @@ $(document).ready(function(){
},
onSubmit : function(file, ext){

var maxfiles = $('#'+fieldname+'_maxfiles').val();
var filecount = $('#'+fieldname+'_filecount').val();
var maxfiles = parseInt($('#'+fieldname+'_maxfiles').val());
var filecount = parseInt($('#'+fieldname+'_filecount').val());
var allowed_filetypes = $('#'+fieldname+'_allowed_filetypes').val().split(",");

/* If maximum number of allowed filetypes have already been uploaded,
Expand Down Expand Up @@ -158,10 +158,10 @@ $(document).ready(function(){

// add file to the list
$('#'+fieldname+'_listfiles').prepend(previewblock);
var filecount = $('#'+fieldname+'_filecount').val();
var minfiles = $('#'+fieldname+'_minfiles').val();
var filecount = parseInt($('#'+fieldname+'_filecount').val());
var minfiles = parseInt($('#'+fieldname+'_minfiles').val());
filecount++;
var maxfiles = $('#'+fieldname+'_maxfiles').val();
var maxfiles = parseInt($('#'+fieldname+'_maxfiles').val());
$('#'+fieldname+'_filecount').val(filecount);

if (filecount < minfiles)
Expand All @@ -170,7 +170,7 @@ $(document).ready(function(){
$('#uploadstatus').html(translt.errorMoreAllowed.replace('%s',(maxfiles - filecount)));
else
$('#uploadstatus').html(translt.errorMaxReached);

if (filecount >= maxfiles)
$('#notice').html('<p class="success">'+translt.errorTooMuch+'</p>');
}
Expand All @@ -194,7 +194,7 @@ function isValueInArray(arr, val) {
function passJSON(fieldname, show_title, show_comment, pos) {
var json = "[";
var filecount = 0;
var licount = $('#'+fieldname+'_licount').val();
var licount = parseInt($('#'+fieldname+'_licount').val());
var i = 0;

while (i <= licount)
Expand Down Expand Up @@ -227,8 +227,8 @@ function passJSON(fieldname, show_title, show_comment, pos) {
window.parent.window.copyJSON(json, filecount, fieldname, show_title, show_comment, pos);
}
function saveAndExit(fieldname, show_title, show_comment, pos) {
var filecount = $('#'+fieldname+'_filecount').val();
var minfiles = $('#'+fieldname+'_minfiles').val();
var filecount = parseInt($('#'+fieldname+'_filecount').val());
var minfiles = parseInt($('#'+fieldname+'_minfiles').val());

if (minfiles != 0 && filecount < minfiles)
{
Expand Down Expand Up @@ -257,8 +257,8 @@ function deletefile(fieldname, count) {
else
xmlhttp=new ActiveXObject("Microsoft.XMLHTTP");

var filecount = $('#'+fieldname+'_filecount').val();
var licount = $('#'+fieldname+'_licount').val();
var filecount = parseInt($('#'+fieldname+'_filecount').val());
var licount = parseInt($('#'+fieldname+'_licount').val());

xmlhttp.onreadystatechange=function()
{
Expand All @@ -285,8 +285,8 @@ function deletefile(fieldname, count) {
file_index++;
}
}
var minfiles = $('#'+fieldname+'_minfiles').val();
var maxfiles = $('#'+fieldname+'_maxfiles').val();
var minfiles = parseInt($('#'+fieldname+'_minfiles').val());
var maxfiles = parseInt($('#'+fieldname+'_maxfiles').val());

if (filecount < minfiles)
$('#uploadstatus').html(translt.errorNeedMore.replace('%s',(minfiles - filecount)));
Expand Down

0 comments on commit a1fb529

Please sign in to comment.