diff --git a/client/galaxy/scripts/mvc/grid/grid-template.js b/client/galaxy/scripts/mvc/grid/grid-template.js index 0bb8c2ba7d6..63e407e16ac 100644 --- a/client/galaxy/scripts/mvc/grid/grid-template.js +++ b/client/galaxy/scripts/mvc/grid/grid-template.js @@ -93,7 +93,9 @@ export default { if (column.visible) { tmpl += ``; if (column.sortable) { - tmpl += `${column.label}`; + tmpl += `${ + column.label + }`; } else { tmpl += column.label; } diff --git a/client/galaxy/scripts/mvc/upload/default/default-view.js b/client/galaxy/scripts/mvc/upload/default/default-view.js index 2ad8b4cd2ae..ede97d8b757 100644 --- a/client/galaxy/scripts/mvc/upload/default/default-view.js +++ b/client/galaxy/scripts/mvc/upload/default/default-view.js @@ -250,7 +250,7 @@ export default Backbone.View.extend({ /** Progress */ _eventProgress: function(index, percentage) { var it = this.collection.get(index); - it.set({percentage: percentage, status: "running", info: ""}); + it.set({ percentage: percentage, status: "running", info: "" }); this.ui_button.model.set("percentage", this._uploadPercentage(percentage, it.get("file_size"))); }, @@ -464,7 +464,7 @@ export default Backbone.View.extend({ /** Template */ _template: function() { - return `
+ return `
diff --git a/client/galaxy/scripts/utils/uploadbox.js b/client/galaxy/scripts/utils/uploadbox.js index a5447b51dfd..44faa6e7025 100644 --- a/client/galaxy/scripts/utils/uploadbox.js +++ b/client/galaxy/scripts/utils/uploadbox.js @@ -9,12 +9,15 @@ xhr request helper */ var _uploadrequest = config => { - var cnf = $.extend({ - error_default: "Please make sure the file is available.", - error_server: "Upload request failed.", - error_login: "Uploads require you to log in.", - error_retry: "Waiting for server to resume...", - }, config); + var cnf = $.extend( + { + error_default: "Please make sure the file is available.", + error_server: "Upload request failed.", + error_login: "Uploads require you to log in.", + error_retry: "Waiting for server to resume..." + }, + config + ); console.debug(cnf); var xhr = new XMLHttpRequest(); xhr.open("POST", cnf.url, true); @@ -23,7 +26,7 @@ xhr.setRequestHeader("Accept", "application/json"); xhr.onreadystatechange = () => { if (xhr.readyState == xhr.DONE) { - if (([502, 0]).indexOf(xhr.status) !== -1 && cnf.warning) { + if ([502, 0].indexOf(xhr.status) !== -1 && cnf.warning) { cnf.warning(cnf.error_retry); } else if (xhr.status < 200 || xhr.status > 299) { var text = xhr.statusText; @@ -112,34 +115,33 @@ data: form, success: upload_response => { var new_start = start + chunk_size; - if (new_start < size ) { + if (new_start < size) { attempts = cnf.attempts; process(new_start); } else { console.debug("Upload completed."); data.payload.inputs = JSON.parse(data.payload.inputs); data.payload.inputs["files_0|file_data"] = { - "session_id": session_id, - "name": file.name + session_id: session_id, + name: file.name }; data.payload.inputs = JSON.stringify(data.payload.inputs); $.ajax({ - url: `${Galaxy.root}api/tools`, + url: `${Galaxy.root}api/tools`, method: "POST", data: data.payload, - success: (tool_response) => { + success: tool_response => { cnf.success(tool_response); }, - error: (tool_response) => { - var err_msg = tool_response && - tool_response.responseJSON && - tool_response.responseJSON.err_msg; + error: tool_response => { + var err_msg = + tool_response && tool_response.responseJSON && tool_response.responseJSON.err_msg; cnf.error(err_msg || cnf.error_tool); } }); } }, - warning: (upload_response) => { + warning: upload_response => { if (--attempts > 0) { console.debug("Retrying last chunk..."); cnf.warning(upload_response); @@ -382,11 +384,13 @@ // create and submit data var submitter = $.uploadpost; - if (file.chunk_mode && + if ( + file.chunk_mode && session && session.id && session.chunk_upload_size && - session.chunk_upload_size > 0) { + session.chunk_upload_size > 0 + ) { submitter = $.uploadchunk; } submitter({