diff --git a/client/galaxy/scripts/mvc/upload/upload-view.js b/client/galaxy/scripts/mvc/upload/upload-view.js index cc6d833b3e5..5fc01186626 100644 --- a/client/galaxy/scripts/mvc/upload/upload-view.js +++ b/client/galaxy/scripts/mvc/upload/upload-view.js @@ -139,7 +139,7 @@ return Backbone.View.extend({ // add tab this.default_view = new UploadViewDefault(this); this.tabs.add({ - id : 'default', + id : 'regular', title : 'Regular', $el : this.default_view.$el }); diff --git a/client/galaxy/scripts/utils/uploadbox.js b/client/galaxy/scripts/utils/uploadbox.js index 736a7b8cbcf..cd97f5e478d 100755 --- a/client/galaxy/scripts/utils/uploadbox.js +++ b/client/galaxy/scripts/utils/uploadbox.js @@ -1,14 +1,12 @@ /* galaxy upload lib - uses FileReader, FormData and XMLHttpRequest */ -;(function($) -{ +;(function($){ // add event properties jQuery.event.props.push("dataTransfer"); // default options - var default_opts = - { + var default_opts = { url : '', paramname : 'content', maxfilesize : 2048, @@ -50,8 +48,7 @@ var xhr = null; // attach to element - $.fn.uploadbox = function(options) - { + $.fn.uploadbox = function(options) { // parse options opts = $.extend({}, default_opts, options); @@ -59,16 +56,16 @@ el = this; // append upload button - el.append(''); + var $uploadbox_input = $(''); + el.append($uploadbox_input); // attach events el.on('drop', drop); el.on('dragover', dragover); el.on('dragleave', dragleave); - + // attach change event - $('#uploadbox_input').change(function(e) - { + $uploadbox_input.change(function(e) { // add files to queue add(e.target.files); @@ -77,8 +74,7 @@ }); // drop event - function drop(e) - { + function drop(e) { // check if it's a file transfer if(!e.dataTransfer) return; @@ -94,30 +90,26 @@ } // drag over - function dragover(e) - { + function dragover(e) { e.preventDefault(); opts.dragover.call(e); } // drag leave - function dragleave(e) - { + function dragleave(e) { e.stopPropagation(); opts.dragleave.call(e); } // progress - function progress(e) - { + function progress(e) { // get percentage if (e.lengthComputable) opts.progress(this.index, this.file, Math.round((e.loaded * 100) / e.total)); } // respond to an upload request - function add(files) - { + function add(files) { // only allow adding file if current batch is complete if (queue_running) return; @@ -126,8 +118,7 @@ var current_index = queue_index; // add files to queue - for (var i = 0; i < files.length; i++) - { + for (var i = 0; i < files.length; i++) { // new identifier var index = String(queue_index++); @@ -147,10 +138,8 @@ } // remove entry from queue - function remove(index) - { - if (queue[index]) - { + function remove(index) { + if (queue[index]) { // remove from queue delete queue[index]; @@ -160,22 +149,20 @@ } // process an upload, recursive - function process() - { + function process() { // validate - if (queue_length == 0 || queue_stop) - { + if (queue_length == 0 || queue_stop) { queue_stop = false; queue_running = false; opts.complete(); return; - } else + } else { queue_running = true; - + } + // get an identifier from the queue var index = -1; - for (var key in queue) - { + for (var key in queue) { index = key; break; } @@ -194,8 +181,7 @@ var maxfilesize = 1048576 * opts.maxfilesize; // check file size, unless it's an ftp file - if (filesize < maxfilesize || file.mode == 'ftp') - { + if (filesize < maxfilesize || file.mode == 'ftp') { // get parameters var data = opts.initialize(index, file); @@ -211,8 +197,7 @@ } // send file - function send (index, file, data) - { + function send (index, file, data) { // construct form data var formData = new FormData(); for (var key in data) { @@ -232,18 +217,16 @@ xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); // captures state changes - xhr.onreadystatechange = function() - { + xhr.onreadystatechange = function() { // check for request completed, server connection closed - if (xhr.readyState != xhr.DONE) + if (xhr.readyState != xhr.DONE) { return; - + } + // retrieve response var response = null; - if (xhr.responseText) - { - try - { + if (xhr.responseText) { + try { response = jQuery.parseJSON(xhr.responseText); } catch (e) { response = xhr.responseText; @@ -251,8 +234,7 @@ } // pass any error to the error option - if (xhr.status < 200 || xhr.status > 299) - { + if (xhr.status < 200 || xhr.status > 299) { // format status var text = xhr.statusText; if (xhr.status == 403) @@ -264,9 +246,10 @@ // request error error(index, file, text + " (" + xhr.status + ")"); - } else + } else { // parse response success(index, file, response); + } } // prepare upload progress @@ -279,8 +262,7 @@ } // success - function success (index, file, msg) - { + function success (index, file, msg) { // parse message opts.success(index, file, msg); @@ -289,8 +271,7 @@ } // error - function error (index, file, err) - { + function error (index, file, err) { // parse error opts.error(index, file, err); @@ -303,38 +284,32 @@ */ // open file browser for selection - function select() - { - $('#uploadbox_input').trigger('click'); + function select() { + $uploadbox_input.trigger('click'); } // remove all entries from queue - function reset(index) - { + function reset(index) { for (index in queue) remove(index); } // initiate upload process - function start() - { - if (!queue_running) - { + function start() { + if (!queue_running) { queue_running = true; process(); } } // stop upload process - function stop() - { + function stop() { // request stop queue_stop = true; } // set options - function configure(options) - { + function configure(options) { // update current configuration opts = $.extend({}, opts, options); @@ -343,8 +318,7 @@ } // verify browser compatibility - function compatible() - { + function compatible() { return window.File && window.FormData && window.XMLHttpRequest && window.FileList; } diff --git a/static/maps/utils/uploadbox.js.map b/static/maps/utils/uploadbox.js.map index d1f0cbd5621..b30c3a47cd1 100644 --- a/static/maps/utils/uploadbox.js.map +++ b/static/maps/utils/uploadbox.js.map @@ -1 +1 @@ -{"version":3,"file":"uploadbox.js","sources":["../../src/utils/uploadbox.js"],"names":["$","jQuery","event","props","push","default_opts","url","paramname","maxfilesize","dragover","dragleave","announce","initialize","progress","success","error","index","file","message","alert","complete","error_filesize","error_default","error_server","error_login","error_missing","opts","queue","queue_index","queue_length","queue_running","queue_stop","el","xhr","fn","uploadbox","options","drop","e","dataTransfer","add","files","preventDefault","call","stopPropagation","lengthComputable","this","Math","round","loaded","total","current_index","i","length","String","remove","process","key","filesize","size","mode","data","send","formData","FormData","append","name","XMLHttpRequest","open","setRequestHeader","onreadystatechange","readyState","DONE","response","responseText","parseJSON","status","text","statusText","upload","addEventListener","msg","err","select","trigger","reset","start","stop","configure","extend","compatible","window","File","FileList","on","change","target","val"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"uploadbox.js","sources":["../../src/utils/uploadbox.js"],"names":["$","jQuery","event","props","push","default_opts","url","paramname","maxfilesize","dragover","dragleave","announce","initialize","progress","success","error","index","file","message","alert","complete","error_filesize","error_default","error_server","error_login","error_missing","opts","queue","queue_index","queue_length","queue_running","queue_stop","el","xhr","fn","uploadbox","options","drop","e","dataTransfer","add","files","preventDefault","call","stopPropagation","lengthComputable","this","Math","round","loaded","total","current_index","i","length","String","remove","process","key","filesize","size","mode","data","send","formData","FormData","append","name","XMLHttpRequest","open","setRequestHeader","onreadystatechange","readyState","DONE","response","responseText","parseJSON","status","text","statusText","upload","addEventListener","msg","err","select","$uploadbox_input","trigger","reset","start","stop","configure","extend","compatible","window","File","FileList","on","change","target","val"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/upload/upload-view.js b/static/scripts/mvc/upload/upload-view.js index 76b906086a6..6f1af915ef7 100644 --- a/static/scripts/mvc/upload/upload-view.js +++ b/static/scripts/mvc/upload/upload-view.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/ui/ui-modal","mvc/ui/ui-tabs","mvc/upload/upload-button","mvc/upload/upload-view-default"],function(a,b,c,d,e){return Backbone.View.extend({options:{nginx_upload_path:"",ftp_upload_site:"n/a",default_genome:"?",default_extension:"auto",height:500,width:900,auto:{id:"auto",text:"Auto-detect",description:"This system will try to detect the file type automatically. If your file is not detected properly as one of the known formats, it most likely means that it has some format problems (e.g., different number of columns on different rows). You can still coerce the system to set your data to the format you think it should be. You can also upload compressed files, which will automatically be decompressed."}},modal:null,ui_button:null,current_history:null,list_extensions:[],list_genomes:[],initialize:function(b){var c=this;this.options=a.merge(b,this.options),this.ui_button=new d.Model,this.ui_button_view=new d.View({model:this.ui_button,onclick:function(a){a.preventDefault(),c.show()},onunload:function(){}}),$(".with-upload-button").append(this.ui_button_view.$el);var c=this;a.get({url:galaxy_config.root+"api/datatypes?extension_only=False",success:function(a){for(key in a)c.list_extensions.push({id:a[key].extension,text:a[key].extension,description:a[key].description,description_url:a[key].description_url});c.list_extensions.sort(function(a,b){return a.text>b.text?1:a.textb.text?1:a.textComposite upload panel")}),this.modal=new b.View({title:"Download data directly from web or upload files from your disk",body:this.tabs.$el,height:this.options.height,width:this.options.width,closing_events:!0}),this.modal.$el.find(".modal-header").css({border:"none","padding-bottom":"0px"})),void this.modal.show()):void window.setTimeout(function(){a.show()},500)},refresh:function(){this.current_user=Galaxy.currUser.get("id"),this.current_history=null,this.current_user&&(this.current_history=Galaxy.currHistoryPanel.model.get("id"))}})}); +define(["utils/utils","mvc/ui/ui-modal","mvc/ui/ui-tabs","mvc/upload/upload-button","mvc/upload/upload-view-default"],function(a,b,c,d,e){return Backbone.View.extend({options:{nginx_upload_path:"",ftp_upload_site:"n/a",default_genome:"?",default_extension:"auto",height:500,width:900,auto:{id:"auto",text:"Auto-detect",description:"This system will try to detect the file type automatically. If your file is not detected properly as one of the known formats, it most likely means that it has some format problems (e.g., different number of columns on different rows). You can still coerce the system to set your data to the format you think it should be. You can also upload compressed files, which will automatically be decompressed."}},modal:null,ui_button:null,current_history:null,list_extensions:[],list_genomes:[],initialize:function(b){var c=this;this.options=a.merge(b,this.options),this.ui_button=new d.Model,this.ui_button_view=new d.View({model:this.ui_button,onclick:function(a){a.preventDefault(),c.show()},onunload:function(){}}),$(".with-upload-button").append(this.ui_button_view.$el);var c=this;a.get({url:galaxy_config.root+"api/datatypes?extension_only=False",success:function(a){for(key in a)c.list_extensions.push({id:a[key].extension,text:a[key].extension,description:a[key].description,description_url:a[key].description_url});c.list_extensions.sort(function(a,b){return a.text>b.text?1:a.textb.text?1:a.textComposite upload panel")}),this.modal=new b.View({title:"Download data directly from web or upload files from your disk",body:this.tabs.$el,height:this.options.height,width:this.options.width,closing_events:!0}),this.modal.$el.find(".modal-header").css({border:"none","padding-bottom":"0px"})),void this.modal.show()):void window.setTimeout(function(){a.show()},500)},refresh:function(){this.current_user=Galaxy.currUser.get("id"),this.current_history=null,this.current_user&&(this.current_history=Galaxy.currHistoryPanel.model.get("id"))}})}); //# sourceMappingURL=../../../maps/mvc/upload/upload-view.js.map \ No newline at end of file diff --git a/static/scripts/utils/uploadbox.js b/static/scripts/utils/uploadbox.js index 57f35fabf0d..3c0b63eb005 100755 --- a/static/scripts/utils/uploadbox.js +++ b/static/scripts/utils/uploadbox.js @@ -1,2 +1,2 @@ -!function(a){jQuery.event.props.push("dataTransfer");var b={url:"",paramname:"content",maxfilesize:2048,dragover:function(){},dragleave:function(){},announce:function(){},initialize:function(){},progress:function(){},success:function(){},error:function(a,b,c){alert(c)},complete:function(){},error_filesize:"File exceeds 2GB. Please use an FTP client.",error_default:"Please make sure the file is available.",error_server:"Upload request failed.",error_login:"Uploads require you to log in.",error_missing:"No upload content available."},c={},d={},e=0,f=0,g=!1,h=!1,i=null,j=null;a.fn.uploadbox=function(k){function l(a){return a.dataTransfer?(p(a.dataTransfer.files),a.preventDefault(),!1):void 0}function m(a){a.preventDefault(),c.dragover.call(a)}function n(a){a.stopPropagation(),c.dragleave.call(a)}function o(a){a.lengthComputable&&c.progress(this.index,this.file,Math.round(100*a.loaded/a.total))}function p(a){if(!g){for(var b=e,h=0;hi||"ftp"==e.mode){var k=c.initialize(a,e);k?s(a,e,k):u(a,e,c.error_missing)}else u(a,e,c.error_filesize)}function s(a,b,d){var e=new FormData;for(var f in d)e.append(f,d[f]);b.size>0&&c.paramname&&e.append(c.paramname,b,b.name),j=new XMLHttpRequest,j.open("POST",c.url,!0),j.setRequestHeader("Accept","application/json"),j.setRequestHeader("Cache-Control","no-cache"),j.setRequestHeader("X-Requested-With","XMLHttpRequest"),j.onreadystatechange=function(){if(j.readyState==j.DONE){var d=null;if(j.responseText)try{d=jQuery.parseJSON(j.responseText)}catch(e){d=j.responseText}if(j.status<200||j.status>299){var f=j.statusText;403==j.status?f=c.error_login:0==j.status?f=c.error_server:f||(f=c.error_default),u(a,b,f+" ("+j.status+")")}else t(a,b,d)}},j.upload.index=a,j.upload.file=b,j.upload.addEventListener("progress",o,!1),j.send(e)}function t(a,b,d){c.success(a,b,d),r()}function u(a,b,d){c.error(a,b,d),r()}function v(){a("#uploadbox_input").trigger("click")}function w(a){for(a in d)q(a)}function x(){g||(g=!0,r())}function y(){h=!0}function z(b){return c=a.extend({},c,b)}function A(){return window.File&&window.FormData&&window.XMLHttpRequest&&window.FileList}return c=a.extend({},b,k),i=this,i.append(''),i.on("drop",l),i.on("dragover",m),i.on("dragleave",n),a("#uploadbox_input").change(function(b){p(b.target.files),a(this).val("")}),{select:v,add:p,remove:q,start:x,stop:y,reset:w,configure:z,compatible:A}}}(jQuery); +!function(a){jQuery.event.props.push("dataTransfer");var b={url:"",paramname:"content",maxfilesize:2048,dragover:function(){},dragleave:function(){},announce:function(){},initialize:function(){},progress:function(){},success:function(){},error:function(a,b,c){alert(c)},complete:function(){},error_filesize:"File exceeds 2GB. Please use an FTP client.",error_default:"Please make sure the file is available.",error_server:"Upload request failed.",error_login:"Uploads require you to log in.",error_missing:"No upload content available."},c={},d={},e=0,f=0,g=!1,h=!1,i=null,j=null;a.fn.uploadbox=function(k){function l(a){return a.dataTransfer?(p(a.dataTransfer.files),a.preventDefault(),!1):void 0}function m(a){a.preventDefault(),c.dragover.call(a)}function n(a){a.stopPropagation(),c.dragleave.call(a)}function o(a){a.lengthComputable&&c.progress(this.index,this.file,Math.round(100*a.loaded/a.total))}function p(a){if(!g){for(var b=e,h=0;hi||"ftp"==e.mode){var k=c.initialize(a,e);k?s(a,e,k):u(a,e,c.error_missing)}else u(a,e,c.error_filesize)}function s(a,b,d){var e=new FormData;for(var f in d)e.append(f,d[f]);b.size>0&&c.paramname&&e.append(c.paramname,b,b.name),j=new XMLHttpRequest,j.open("POST",c.url,!0),j.setRequestHeader("Accept","application/json"),j.setRequestHeader("Cache-Control","no-cache"),j.setRequestHeader("X-Requested-With","XMLHttpRequest"),j.onreadystatechange=function(){if(j.readyState==j.DONE){var d=null;if(j.responseText)try{d=jQuery.parseJSON(j.responseText)}catch(e){d=j.responseText}if(j.status<200||j.status>299){var f=j.statusText;403==j.status?f=c.error_login:0==j.status?f=c.error_server:f||(f=c.error_default),u(a,b,f+" ("+j.status+")")}else t(a,b,d)}},j.upload.index=a,j.upload.file=b,j.upload.addEventListener("progress",o,!1),j.send(e)}function t(a,b,d){c.success(a,b,d),r()}function u(a,b,d){c.error(a,b,d),r()}function v(){B.trigger("click")}function w(a){for(a in d)q(a)}function x(){g||(g=!0,r())}function y(){h=!0}function z(b){return c=a.extend({},c,b)}function A(){return window.File&&window.FormData&&window.XMLHttpRequest&&window.FileList}c=a.extend({},b,k),i=this;var B=a('');return i.append(B),i.on("drop",l),i.on("dragover",m),i.on("dragleave",n),B.change(function(b){p(b.target.files),a(this).val("")}),{select:v,add:p,remove:q,start:x,stop:y,reset:w,configure:z,compatible:A}}}(jQuery); //# sourceMappingURL=../../maps/utils/uploadbox.js.map \ No newline at end of file