diff --git a/_assets/js/app.js b/_assets/js/app.js index 92b96f0..4bad605 100644 --- a/_assets/js/app.js +++ b/_assets/js/app.js @@ -2,20 +2,28 @@ $('#dataform').on('submit', function (e) { e.preventDefault(); - var warData = JSON.parse( $.trim( $('#data').val() ) ); + var inputContent = $.trim( $('#data').val() ); - if( warData.results && - warData.results[0] && - warData.results[0].ident == "body" && - warData.results[1] && - warData.results[1].ident == "clanWarGetInfo" && - warData.results[1].result && - warData.results[1].result.response ) { + if ( document.getElementById("fileUpload").files.length > 0 ) { + getFileContents( document.getElementById("fileUpload").files[0] ); + } + else if (inputContent.length > 0) { + var warData = JSON.parse( inputContent ); initApp(warData, 'withSave', warData); - }; + } }); function initApp (data, callback, callbackData) { + if( !data.results || + !data.results[0] || + !data.results[0].ident == "body" || + !data.results[1] || + !data.results[1].ident == "clanWarGetInfo" || + !data.results[1].result || + !data.results[1].result.response ) { + return false; + } + console.log(data) var mapData = data.results[1].result.response; diff --git a/_assets/js/file_reader.js b/_assets/js/file_reader.js new file mode 100644 index 0000000..d6b84c9 --- /dev/null +++ b/_assets/js/file_reader.js @@ -0,0 +1,17 @@ +function getFileContents(file) { + var file = document.getElementById("fileUpload").files[0]; + var fileContents = false; + + if (file) { + var reader = new FileReader(); + reader.readAsText(file, "UTF-8"); + reader.onload = function (evt) { + var warData = JSON.parse(evt.target.result); + initApp(warData, 'withSave', warData); + } + reader.onerror = function (evt) { + console.error('error reading the file.') + } + } +} + diff --git a/_includes/header.html b/_includes/header.html index 0dbb004..489da8f 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -8,6 +8,7 @@