diff -r 202272a28052 -r bb8a37fe6326 www/js/import_ingredients.js --- a/www/js/import_ingredients.js Sat Oct 19 21:23:06 2019 +0200 +++ b/www/js/import_ingredients.js Sat Oct 19 23:06:42 2019 +0200 @@ -21,49 +21,49 @@ *****************************************************************************/ -$(document).ready(function () { +$(document).ready(function() { - var url = ''; + var url = ''; - if (my_select == 'fermentables') - url = 'upl_fermentables.php'; - else if (my_select == 'hops') - url = 'upl_hops.php'; - else if (my_select == 'miscs') - url = 'upl_miscs.php'; - else if (my_select == 'yeasts') - url = 'upl_yeasts.php'; - else if (my_select == "styles") - url = 'upl_styles.php'; + if (my_select == 'fermentables') + url = 'upl_fermentables.php'; + else if (my_select == 'hops') + url = 'upl_hops.php'; + else if (my_select == 'miscs') + url = 'upl_miscs.php'; + else if (my_select == 'yeasts') + url = 'upl_yeasts.php'; + else if (my_select == 'styles') + url = 'upl_styles.php'; - $('#jqxFileUpload').jqxFileUpload({ - width: 300, - browseTemplate: 'success', - cancelTemplate: 'inverse', - uploadTemplate: 'primary', - theme: theme, - multipleFilesUpload: false, - accept: 'application/xml', - uploadUrl: url, - fileInputName: 'fileToUpload' - }); - $('#eventsPanel').jqxPanel({ - width: 800, - height: 200, - theme: theme - }); - $('#jqxFileUpload').on('select', function (event) { - var args = event.args, - fileName = args.file, - fileSize = args.size; - $('#eventsPanel').jqxPanel('clearcontent'); - $('#eventsPanel').jqxPanel('append', '' + event.type + ': ' + fileName + ' size: ' + fileSize + '
'); - }); - $('#jqxFileUpload').on('uploadEnd', function (event) { - var args = event.args, - fileName = args.file, - serverResponce = args.response; - $('#eventsPanel').jqxPanel('append', '' + event.type + ': ontvangen ' + fileName + '
' + serverResponce + '
'); - }); + $('#jqxFileUpload').jqxFileUpload({ + width: 300, + browseTemplate: 'success', + cancelTemplate: 'inverse', + uploadTemplate: 'primary', + theme: theme, + multipleFilesUpload: false, + accept: 'application/xml', + uploadUrl: url, + fileInputName: 'fileToUpload' + }); + $('#eventsPanel').jqxPanel({ + width: 800, + height: 200, + theme: theme + }); + $('#jqxFileUpload').on('select', function(event) { + var args = event.args, + fileName = args.file, + fileSize = args.size; + $('#eventsPanel').jqxPanel('clearcontent'); + $('#eventsPanel').jqxPanel('append', '' + event.type + ': ' + fileName + ' size: ' + fileSize + '
'); + }); + $('#jqxFileUpload').on('uploadEnd', function(event) { + var args = event.args, + fileName = args.file, + serverResponce = args.response; + $('#eventsPanel').jqxPanel('append', '' + event.type + ': ontvangen ' + fileName + '
' + serverResponce + '
'); + }); });