From 85fc57696f0f92014780134ade8a1482dd61dca6 Mon Sep 17 00:00:00 2001 From: guerler Date: Fri, 17 Jul 2015 15:18:34 -0400 Subject: [PATCH] [WIP] Reinserting button panel --- .../galaxy/scripts/mvc/upload/upload-ftp.js | 4 +- .../scripts/mvc/upload/upload-settings.js | 14 +- .../scripts/mvc/upload/upload-view-default.js | 174 ++++++++---------- .../galaxy/scripts/mvc/upload/upload-view.js | 30 +-- client/galaxy/style/less/upload.less | 6 +- static/maps/mvc/upload/upload-ftp.js.map | 2 +- static/maps/mvc/upload/upload-settings.js.map | 2 +- .../mvc/upload/upload-view-default.js.map | 2 +- static/maps/mvc/upload/upload-view.js.map | 2 +- static/scripts/mvc/upload/upload-settings.js | 2 +- .../scripts/mvc/upload/upload-view-default.js | 2 +- static/scripts/mvc/upload/upload-view.js | 2 +- static/style/blue/base.css | 6 +- 13 files changed, 120 insertions(+), 128 deletions(-) diff --git a/client/galaxy/scripts/mvc/upload/upload-ftp.js b/client/galaxy/scripts/mvc/upload/upload-ftp.js index 28413e8a8e8..e378ae0a48e 100644 --- a/client/galaxy/scripts/mvc/upload/upload-ftp.js +++ b/client/galaxy/scripts/mvc/upload/upload-ftp.js @@ -1,7 +1,5 @@ -// dependencies +/** This renders the content of the ftp popup **/ define(['utils/utils'], function(Utils) { - -// item view return Backbone.View.extend({ // options options: { diff --git a/client/galaxy/scripts/mvc/upload/upload-settings.js b/client/galaxy/scripts/mvc/upload/upload-settings.js index 75d6a0923c3..063ce2e16e7 100644 --- a/client/galaxy/scripts/mvc/upload/upload-settings.js +++ b/client/galaxy/scripts/mvc/upload/upload-settings.js @@ -1,7 +1,5 @@ -// dependencies +/** This renders the content of the settings popup, allowing users to specify flags i.e. for space-to-tabs conversion **/ define(['utils/utils'], function(Utils) { - -// item view return Backbone.View.extend({ // options options: { @@ -9,7 +7,7 @@ return Backbone.View.extend({ class_uncheck : 'upload-icon-button fa fa-square-o' }, - // render + // initialize initialize: function(app) { // link app this.app = app; @@ -24,12 +22,12 @@ return Backbone.View.extend({ this.model = this.app.model; // ui event: space to tabs - this.$el.find('#upload-space-to-tabs').on('click', function() { + this.$('#upload-space-to-tabs').on('click', function() { self._switchState('#upload-space-to-tabs', 'space_to_tabs'); }); // ui event: to posix - this.$el.find('#upload-to-posix-lines').on('click', function() { + this.$('#upload-to-posix-lines').on('click', function() { self._switchState('#upload-to-posix-lines', 'to_posix_lines'); }); @@ -49,7 +47,7 @@ return Backbone.View.extend({ this._renderState('#upload-to-posix-lines', this.model.get('to_posix_lines')); // disable options - var $cover = this.$el.find('#upload-settings-cover'); + var $cover = this.$('#upload-settings-cover'); if (this.model.get('status') != 'init') { $cover.show(); } else { @@ -69,7 +67,7 @@ return Backbone.View.extend({ // render state _renderState: function (element_id, checked) { // swith icon class - var $it = this.$el.find(element_id); + var $it = this.$(element_id); $it.removeClass(); if (checked) { $it.addClass(this.options.class_check); diff --git a/client/galaxy/scripts/mvc/upload/upload-view-default.js b/client/galaxy/scripts/mvc/upload/upload-view-default.js index 98cf947b51e..56c777d4d02 100644 --- a/client/galaxy/scripts/mvc/upload/upload-view-default.js +++ b/client/galaxy/scripts/mvc/upload/upload-view-default.js @@ -1,10 +1,11 @@ -// dependencies +/** Renders contents of the default upload viewer */ define(['utils/utils', 'mvc/upload/upload-model', 'mvc/upload/upload-row', 'mvc/upload/upload-ftp', 'mvc/ui/ui-popover', 'mvc/ui/ui-select', + 'mvc/ui/ui-misc', 'utils/uploadbox'], function( Utils, @@ -12,24 +13,11 @@ define(['utils/utils', UploadItem, UploadFtp, Popover, - Select + Select, + Ui ) { -// galaxy upload return Backbone.View.extend({ - // default extension - default_extension : 'auto', - - // default genome - default_genome : '?', - - // datatype placeholder for auto-detection - 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.' - }, - // extension selector select_extension : null, @@ -63,36 +51,34 @@ return Backbone.View.extend({ }, // initialize - initialize : function(app, options) { + initialize : function(app) { + // link app + this.app = app; + this.options = app.options; + this.list_extensions = app.list_extensions; + this.list_genomes = app.list_genomes; + this.ui_button = app.ui_button; + // link this var self = this; - - this.app = app; - // set element - this.setElement(this._template('upload-box', 'upload-info')); - - /*this.modal = new Modal.View({ - title : 'Download data directly from web or upload files from your disk', - body : , - buttons : { - 'Choose local file' : function() {self.uploadbox.select()}, - 'Choose FTP file' : function() {self._eventFtp()}, - 'Paste/Fetch data' : function() {self._eventCreate()}, - 'Start' : function() {self._eventStart()}, - 'Pause' : function() {self._eventStop()}, - 'Reset' : function() {self._eventReset()}, - 'Close' : function() {self.modal.hide()}, - }, - height : '400', - width : '900', - closing_events : true - });*/ + this.setElement(this._template()); + // create button section + this.btnLocal = new Ui.Button({ title: 'Choose local file', onclick: function() { self.uploadbox.select(); } }); + this.btnFtp = new Ui.Button({ title: 'Choose FTP file', onclick: function() { self._eventFtp(); } }); + this.btnCreate = new Ui.Button({ title: 'Paste/Fetch data', onclick: function() { self._eventCreate(); } }); + this.btnStart = new Ui.Button({ title: 'Start', onclick: function() { self._eventStart(); } }); + this.btnStop = new Ui.Button({ title: 'Pause', onclick: function() { self._eventStop(); } }); + this.btnReset = new Ui.Button({ title: 'Reset', onclick: function() { self._eventReset(); } }); + this.btnClose = new Ui.Button({ title: 'Close', onclick: function() { self.app.modal.hide(); } }); - // set element - //this.setElement('#upload-box'); + // append buttons to dom + var buttons = [this.btnLocal, this.btnFtp, this.btnCreate, this.btnStart, this.btnStop, this.btnReset, this.btnClose]; + for (var i in buttons) { + this.$('#upload-buttons').prepend(buttons[i].$el); + } // file upload var self = this; @@ -105,40 +91,39 @@ return Backbone.View.extend({ complete : function() { self._eventComplete() } }); - /*/ add ftp file viewer - var button = this.modal.getButton('Choose FTP file'); + // add ftp file viewer this.ftp = new Popover.View({ title : 'FTP files', - container : button - });*/ + container : this.btnFtp.$el + }); // select extension this.select_extension = new Select.View({ - css : 'header-selection', - data : this.app.list_extensions, - container : this.$el.find('#header-extension'), - value : this.default_extension, + css : 'footer-selection', + container : this.$('#footer-extension'), + data : this.list_extensions, + value : this.options.default_extension, onchange : function(extension) { self.updateExtension(extension); } }); // handle extension info popover - self.$el.parent().find('#header-extension-info').on('click' , function(e) { - self._showExtensionInfo({ + self.$('#footer-extension-info').on('click' , function(e) { + self.showExtensionInfo({ $el : $(e.target), title : self.select_extension.text(), extension : self.select_extension.value(), placement : 'top' }); }).on('mousedown', function(e) { e.preventDefault(); }); - + // genome extension this.select_genome = new Select.View({ - css : 'header-selection', - data : this.app.list_genomes, - container : this.$el.find('#header-genome'), - value : this.default_genome, + css : 'footer-selection', + container : this.$('#footer-genome'), + data : this.list_genomes, + value : this.options.default_genome, onchange : function(genome) { self.updateGenome(genome); } @@ -203,7 +188,7 @@ return Backbone.View.extend({ this.collection.add(upload_item.model); // add upload item element to table - $(this.el).find('tbody:first').append(upload_item.$el); + this.$('#upload-table > tbody:first').append(upload_item.$el); // render upload_item.render(); @@ -351,8 +336,8 @@ return Backbone.View.extend({ // events triggered by this view // - // display extension info popup - _showExtensionInfo : function(options) { + // [public] display extension info popup + showExtensionInfo : function(options) { // initialize var self = this; var $el = options.$el; @@ -462,8 +447,8 @@ return Backbone.View.extend({ this.uploadbox.reset(); // reset value for universal type drop-down - this.select_extension.value(this.default_extension); - this.select_genome.value(this.default_genome); + this.select_extension.value(this.options.default_extension); + this.select_genome.value(this.options.default_genome); // reset button this.ui_button.set('percentage', 0); @@ -474,7 +459,7 @@ return Backbone.View.extend({ updateExtension: function(extension, defaults_only) { var self = this; this.collection.each(function(item) { - if (item.get('status') == 'init' && (item.get('extension') == self.default_extension || !defaults_only)) { + if (item.get('status') == 'init' && (item.get('extension') == self.options.default_extension || !defaults_only)) { item.set('extension', extension); } }); @@ -484,7 +469,7 @@ return Backbone.View.extend({ updateGenome: function(genome, defaults_only) { var self = this; this.collection.each(function(item) { - if (item.get('status') == 'init' && (item.get('genome') == self.default_genome || !defaults_only)) { + if (item.get('status') == 'init' && (item.get('genome') == self.options.default_genome || !defaults_only)) { item.set('genome', genome); } }); @@ -510,7 +495,7 @@ return Backbone.View.extend({ } // set html content - $('#upload-info').html(message); + this.$('#upload-info').html(message); /* update button status @@ -550,14 +535,14 @@ return Backbone.View.extend({ this.modal.showButton('Choose FTP file'); } else { this.modal.hideButton('Choose FTP file'); - } + }*/ // table visibility if (this.counter.announce + this.counter.success + this.counter.error > 0) { - $(this.el).find('#upload-table').show(); + this.$('#upload-table').show(); } else { - $(this.el).find('#upload-table').hide(); - }*/ + this.$('#upload-table').hide(); + } }, // calculate percentage of all queued uploads @@ -579,32 +564,35 @@ return Backbone.View.extend({ }, // load html template - _template: function(id, idInfo) { - return '
' + - '
' + - '
' + - '
' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '' + - '
' + - '
' + - 'Type (set all):' + - '' + - ' ' + - 'Genome (set all):' + - '' + + _template: function() { + return '
' + + '
' + + '
' + + '
' + + '
' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '' + + '
' + + '' + + '
' + '
'; } }); diff --git a/client/galaxy/scripts/mvc/upload/upload-view.js b/client/galaxy/scripts/mvc/upload/upload-view.js index 434f133b0ec..c08ffac58d1 100644 --- a/client/galaxy/scripts/mvc/upload/upload-view.js +++ b/client/galaxy/scripts/mvc/upload/upload-view.js @@ -13,26 +13,35 @@ return Backbone.View.extend({ // default options options : { nginx_upload_path : '', - default_genome : '?' + ftp_upload_site : 'n/a', + default_genome : '?', + default_extension : 'auto', + height : 400, + 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.' + } }, // upload modal container - modal : null, + modal: null, // progress button in panel - ui_button : null, + ui_button: null, // current history identifier current_history: null, // contains all available dataset extensions/types - list_extensions : [], + list_extensions: [], // contains all available genomes - list_genomes : [], + list_genomes: [], // initialize - initialize : function(options) { + initialize: function(options) { // link this var self = this; @@ -80,7 +89,7 @@ return Backbone.View.extend({ // add auto field if (!self.options.datatypes_disable_auto) { - self.list_extensions.unshift(self.auto); + self.list_extensions.unshift(self.options.auto); } } }); @@ -123,7 +132,7 @@ return Backbone.View.extend({ if (!this.modal) { // build tabs this.tabs = new Tabs.View(); - + // add tab this.default_view = new UploadViewDefault(this); this.tabs.add({ @@ -133,12 +142,11 @@ return Backbone.View.extend({ }); // make modal - var self = this; this.modal = new Modal.View({ title : 'Download data directly from web or upload files from your disk', body : this.tabs.$el, - height : '400', - width : '900', + height : this.options.height, + width : this.options.width, closing_events : true }); diff --git a/client/galaxy/style/less/upload.less b/client/galaxy/style/less/upload.less index ca6f76af1a5..942264181af 100644 --- a/client/galaxy/style/less/upload.less +++ b/client/galaxy/style/less/upload.less @@ -228,18 +228,18 @@ } } -.upload-header { +.upload-footer { height:5%; text-align:left; max-height:20px; line-height:18px; margin-top: 10px; - .header-title { + .footer-title { font-weight: bold; padding-left: 60px; padding-right: 20px; } - .header-selection{ + .footer-selection{ width:200px; min-width:200px; font-size:11px; diff --git a/static/maps/mvc/upload/upload-ftp.js.map b/static/maps/mvc/upload/upload-ftp.js.map index 61c87e981a6..2b7f25d282c 100644 --- a/static/maps/mvc/upload/upload-ftp.js.map +++ b/static/maps/mvc/upload/upload-ftp.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-ftp.js","sources":["../../../src/mvc/upload/upload-ftp.js"],"names":["define","Utils","Backbone","View","extend","options","class_add","class_remove","class_partial","initialize","app","this","self","setElement","_template","rows","get","url","galaxy_config","root","success","ftp_files","_fill","error","events","mousedown","e","preventDefault","length","$el","find","html","$","_templateTable","size","key","push","_add","bytesToString","$select_all","addClass","on","add","hasClass","ftp_file","model_index","_find","trigger","_refresh","_templateInfo","hide","$it","_templateRow","$icon","el","append","icon_class","removeClass","collection","remove","uploadbox","mode","name","path","filtered","where","file_mode","item","findWhere","file_path","status","ctime","ftp_upload_site"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"upload-ftp.js","sources":["../../../src/mvc/upload/upload-ftp.js"],"names":["define","Utils","Backbone","View","extend","options","class_add","class_remove","class_partial","initialize","app","this","self","setElement","_template","rows","get","url","galaxy_config","root","success","ftp_files","_fill","error","events","mousedown","e","preventDefault","length","$el","find","html","$","_templateTable","size","key","push","_add","bytesToString","$select_all","addClass","on","add","hasClass","ftp_file","model_index","_find","trigger","_refresh","_templateInfo","hide","$it","_templateRow","$icon","el","append","icon_class","removeClass","collection","remove","uploadbox","mode","name","path","filtered","where","file_mode","item","findWhere","file_path","status","ctime","ftp_upload_site"],"mappings":"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"} \ No newline at end of file diff --git a/static/maps/mvc/upload/upload-settings.js.map b/static/maps/mvc/upload/upload-settings.js.map index f60872ef9dc..1bdf4f05e44 100644 --- a/static/maps/mvc/upload/upload-settings.js.map +++ b/static/maps/mvc/upload/upload-settings.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-settings.js","sources":["../../../src/mvc/upload/upload-settings.js"],"names":["define","Backbone","View","extend","options","class_check","class_uncheck","initialize","app","this","self","setElement","_template","model","$el","find","on","_switchState","render","events","mousedown","e","preventDefault","_renderState","get","$cover","show","hide","element_id","parameter_id","checked","set","$it","removeClass","addClass"],"mappings":"AACAA,QAAQ,eAAgB,WAGxB,MAAOC,UAASC,KAAKC,QAEjBC,SACIC,YAAkB,0CAClBC,cAAkB,qCAItBC,WAAY,SAASC,GAEjBC,KAAKD,IAAMA,CAGX,IAAIE,GAAOD,IAGXA,MAAKE,WAAWF,KAAKG,aAGrBH,KAAKI,MAAQJ,KAAKD,IAAIK,MAGtBJ,KAAKK,IAAIC,KAAK,yBAAyBC,GAAG,QAAS,WAC/CN,EAAKO,aAAa,wBAAyB,mBAI/CR,KAAKK,IAAIC,KAAK,0BAA0BC,GAAG,QAAS,WAChDN,EAAKO,aAAa,yBAA0B,oBAIhDR,KAAKS,UAITC,QACIC,UAAc,SAASC,GAAKA,EAAEC,mBAIlCJ,OAAQ,WAEJT,KAAKc,aAAa,wBAAyBd,KAAKI,MAAMW,IAAI,kBAC1Df,KAAKc,aAAa,yBAA0Bd,KAAKI,MAAMW,IAAI,kBAG3D,IAAIC,GAAShB,KAAKK,IAAIC,KAAK,yBACK,SAA5BN,KAAKI,MAAMW,IAAI,UACfC,EAAOC,OAEPD,EAAOE,QAKfV,aAAc,SAAUW,EAAYC,GAChC,GAAgC,QAA5BpB,KAAKI,MAAMW,IAAI,UAAqB,CACpC,GAAIM,IAAWrB,KAAKI,MAAMW,IAAIK,EAC9BpB,MAAKI,MAAMkB,IAAIF,EAAcC,GAC7BrB,KAAKc,aAAaK,EAAYE,KAKtCP,aAAc,SAAUK,EAAYE,GAEhC,GAAIE,GAAMvB,KAAKK,IAAIC,KAAKa,EACxBI,GAAIC,cAEAD,EAAIE,SADJJ,EACarB,KAAKL,QAAQC,YAEbI,KAAKL,QAAQE,gBAKlCM,UAAW,WACP,MAAQ"} \ No newline at end of file +{"version":3,"file":"upload-settings.js","sources":["../../../src/mvc/upload/upload-settings.js"],"names":["define","Backbone","View","extend","options","class_check","class_uncheck","initialize","app","this","self","setElement","_template","model","$","on","_switchState","render","events","mousedown","e","preventDefault","_renderState","get","$cover","show","hide","element_id","parameter_id","checked","set","$it","removeClass","addClass"],"mappings":"AACAA,QAAQ,eAAgB,WACxB,MAAOC,UAASC,KAAKC,QAEjBC,SACIC,YAAkB,0CAClBC,cAAkB,qCAItBC,WAAY,SAASC,GAEjBC,KAAKD,IAAMA,CAGX,IAAIE,GAAOD,IAGXA,MAAKE,WAAWF,KAAKG,aAGrBH,KAAKI,MAAQJ,KAAKD,IAAIK,MAGtBJ,KAAKK,EAAE,yBAAyBC,GAAG,QAAS,WACxCL,EAAKM,aAAa,wBAAyB,mBAI/CP,KAAKK,EAAE,0BAA0BC,GAAG,QAAS,WACzCL,EAAKM,aAAa,yBAA0B,oBAIhDP,KAAKQ,UAITC,QACIC,UAAc,SAASC,GAAKA,EAAEC,mBAIlCJ,OAAQ,WAEJR,KAAKa,aAAa,wBAAyBb,KAAKI,MAAMU,IAAI,kBAC1Dd,KAAKa,aAAa,yBAA0Bb,KAAKI,MAAMU,IAAI,kBAG3D,IAAIC,GAASf,KAAKK,EAAE,yBACY,SAA5BL,KAAKI,MAAMU,IAAI,UACfC,EAAOC,OAEPD,EAAOE,QAKfV,aAAc,SAAUW,EAAYC,GAChC,GAAgC,QAA5BnB,KAAKI,MAAMU,IAAI,UAAqB,CACpC,GAAIM,IAAWpB,KAAKI,MAAMU,IAAIK,EAC9BnB,MAAKI,MAAMiB,IAAIF,EAAcC,GAC7BpB,KAAKa,aAAaK,EAAYE,KAKtCP,aAAc,SAAUK,EAAYE,GAEhC,GAAIE,GAAMtB,KAAKK,EAAEa,EACjBI,GAAIC,cAEAD,EAAIE,SADJJ,EACapB,KAAKL,QAAQC,YAEbI,KAAKL,QAAQE,gBAKlCM,UAAW,WACP,MAAQ"} \ No newline at end of file diff --git a/static/maps/mvc/upload/upload-view-default.js.map b/static/maps/mvc/upload/upload-view-default.js.map index a2bff43c41e..4ac7e3c7cc1 100644 --- a/static/maps/mvc/upload/upload-view-default.js.map +++ b/static/maps/mvc/upload/upload-view-default.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-view-default.js","sources":["../../../src/mvc/upload/upload-view-default.js"],"names":["define","Utils","UploadModel","UploadItem","UploadFtp","Popover","Select","Backbone","View","extend","default_extension","default_genome","auto","id","text","description","select_extension","select_genome","uploadbox","upload_size","collection","Collection","ftp","counter","announce","success","error","running","reset","this","initialize","app","self","setElement","_template","$el","index","file","message","_eventAnnounce","_eventInitialize","progress","_eventProgress","_eventSuccess","_eventError","complete","_eventComplete","css","data","list_extensions","container","find","value","onchange","extension","updateExtension","parent","on","e","_showExtensionInfo","$","target","title","placement","preventDefault","list_genomes","genome","updateGenome","_updateScreen","item","_eventRemove","status","get","remove","upload_item","file_name","name","file_size","size","file_mode","mode","file_path","path","add","model","el","append","render","it","set","url_paste","space_to_tabs","to_posix_lines","configure","url","options","nginx_upload_path","paramname","tool_input","current_history","JSON","stringify","percentage","ui_button","_uploadPercentage","upload_completed","Galaxy","currHistoryPanel","refreshContents","each","_","findWhere","extension_popup","destroy","empty","_templateDescription","show","_eventFtp","visible","hide","_eventCreate","_eventStart","start","_eventStop","stop","html","_eventReset","defaults_only","compatible","tmpl","description_url","idInfo"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"upload-view-default.js","sources":["../../../src/mvc/upload/upload-view-default.js"],"names":["define","Utils","UploadModel","UploadItem","UploadFtp","Popover","Select","Ui","Backbone","View","extend","select_extension","select_genome","uploadbox","upload_size","collection","Collection","ftp","counter","announce","success","error","running","reset","this","initialize","app","options","list_extensions","list_genomes","ui_button","self","setElement","_template","btnLocal","Button","title","onclick","select","btnFtp","_eventFtp","btnCreate","_eventCreate","btnStart","_eventStart","btnStop","_eventStop","btnReset","_eventReset","btnClose","modal","hide","buttons","i","$","prepend","$el","index","file","message","_eventAnnounce","_eventInitialize","progress","_eventProgress","_eventSuccess","_eventError","complete","_eventComplete","container","css","data","value","default_extension","onchange","extension","updateExtension","on","e","showExtensionInfo","target","text","placement","preventDefault","default_genome","genome","updateGenome","_updateScreen","item","_eventRemove","status","get","remove","id","upload_item","file_name","name","file_size","size","file_mode","mode","file_path","path","add","model","append","render","it","set","url_paste","space_to_tabs","to_posix_lines","configure","url","nginx_upload_path","paramname","tool_input","current_history","JSON","stringify","percentage","_uploadPercentage","upload_completed","Galaxy","currHistoryPanel","refreshContents","each","description","_","findWhere","extension_popup","destroy","empty","_templateDescription","show","visible","start","stop","html","defaults_only","compatible","tmpl","description_url"],"mappings":"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"} \ No newline at end of file diff --git a/static/maps/mvc/upload/upload-view.js.map b/static/maps/mvc/upload/upload-view.js.map index 80347253af8..d8b158f7ac0 100644 --- a/static/maps/mvc/upload/upload-view.js.map +++ b/static/maps/mvc/upload/upload-view.js.map @@ -1 +1 @@ -{"version":3,"file":"upload-view.js","sources":["../../../src/mvc/upload/upload-view.js"],"names":["define","Utils","Modal","Tabs","UploadButton","UploadViewDefault","Backbone","View","extend","options","nginx_upload_path","default_genome","modal","ui_button","current_history","list_extensions","list_genomes","initialize","self","this","merge","Model","ui_button_view","model","onclick","e","preventDefault","show","onunload","$","append","$el","get","url","galaxy_config","root","success","datatypes","key","push","id","extension","text","description","description_url","sort","a","b","datatypes_disable_auto","unshift","auto","genomes","Galaxy","currHistoryPanel","window","setTimeout","tabs","default_view","add","title","body","height","width","closing_events","refresh","current_user","currUser"],"mappings":"AACAA,QAAQ,cACA,kBACA,iBACA,2BACA,kCACA,SAAYC,EACAC,EACAC,EACAC,EACAC,GACpB,MAAOC,UAASC,KAAKC,QAEjBC,SACIC,kBAAsB,GACtBC,eAAsB,KAI1BC,MAAQ,KAGRC,UAAY,KAGZC,gBAAiB,KAGjBC,mBAGAC,gBAGAC,WAAa,SAASR,GAElB,GAAIS,GAAOC,IAGXA,MAAKV,QAAUR,EAAMmB,MAAMX,EAASU,KAAKV,SAGzCU,KAAKN,UAAY,GAAIT,GAAaiB,MAGlCF,KAAKG,eAAiB,GAAIlB,GAAaG,MACnCgB,MAAcJ,KAAKN,UACnBW,QAAc,SAASC,GACnBA,EAAEC,iBACFR,EAAKS,QAETC,SAAc,eAQlBC,EAAE,uBAAuBC,OAAOX,KAAKG,eAAeS,IAGpD,IAAIb,GAAOC,IACXlB,GAAM+B,KACFC,IAAUC,cAAcC,KAAO,qCAC/BC,QAAU,SAASC,GACf,IAAKC,MAAOD,GACRnB,EAAKH,gBAAgBwB,MACjBC,GAAkBH,EAAUC,KAAKG,UACjCC,KAAkBL,EAAUC,KAAKG,UACjCE,YAAkBN,EAAUC,KAAKK,YACjCC,gBAAkBP,EAAUC,KAAKM,iBAKzC1B,GAAKH,gBAAgB8B,KAAK,SAASC,EAAGC,GAClC,MAAOD,GAAEJ,KAAOK,EAAEL,KAAO,EAAII,EAAEJ,KAAOK,EAAEL,KAAO,GAAK,IAInDxB,EAAKT,QAAQuC,wBACd9B,EAAKH,gBAAgBkC,QAAQ/B,EAAKgC,SAM9CjD,EAAM+B,KACFC,IAAUC,cAAcC,KAAO,cAC/BC,QAAU,SAASe,GACf,IAAKb,MAAOa,GACRjC,EAAKF,aAAauB,MACdC,GAAUW,EAAQb,KAAK,GACvBI,KAAUS,EAAQb,KAAK,IAK/BpB,GAAKF,aAAa6B,KAAK,SAASC,EAAGC,GAC/B,MAAID,GAAEN,IAAMtB,EAAKT,QAAQE,eAAyB,GAC9CoC,EAAEP,IAAMtB,EAAKT,QAAQE,eAAyB,EAC3CmC,EAAEJ,KAAOK,EAAEL,KAAO,EAAII,EAAEJ,KAAOK,EAAEL,KAAO,GAAK,QAWpEf,KAAM,WAEF,GAAIT,GAAOC,IACX,KAAKiC,OAAOC,mBAAqBD,OAAOC,iBAAiB9B,MAErD,WADA+B,QAAOC,WAAW,WAAarC,EAAKS,QAAU,IAKlD,KAAKR,KAAKP,MAAO,CAEbO,KAAKqC,KAAO,GAAIrD,GAAKI,KAGrBY,KAAKsC,aAAe,GAAIpD,GAAkBc,MAC1CA,KAAKqC,KAAKE,KACNlB,GAAU,UACVmB,MAAU,UACV5B,IAAUZ,KAAKsC,aAAa1B,KAIhC,IAAIb,GAAOC,IACXA,MAAKP,MAAQ,GAAIV,GAAMK,MACnBoD,MAAkB,iEAClBC,KAAkBzC,KAAKqC,KAAKzB,IAC5B8B,OAAkB,MAClBC,MAAkB,MAClBC,gBAAkB,IAItB5C,KAAK6C,UAIT7C,KAAKP,MAAMe,QAIfqC,QAAS,WACL7C,KAAK8C,aAAeb,OAAOc,SAASlC,IAAI,MACxCb,KAAKL,gBAAkB,KACnBK,KAAK8C,eACL9C,KAAKL,gBAAkBsC,OAAOC,iBAAiB9B,MAAMS,IAAI"} \ No newline at end of file +{"version":3,"file":"upload-view.js","sources":["../../../src/mvc/upload/upload-view.js"],"names":["define","Utils","Modal","Tabs","UploadButton","UploadViewDefault","Backbone","View","extend","options","nginx_upload_path","ftp_upload_site","default_genome","default_extension","height","width","auto","id","text","description","modal","ui_button","current_history","list_extensions","list_genomes","initialize","self","this","merge","Model","ui_button_view","model","onclick","e","preventDefault","show","onunload","$","append","$el","get","url","galaxy_config","root","success","datatypes","key","push","extension","description_url","sort","a","b","datatypes_disable_auto","unshift","genomes","Galaxy","currHistoryPanel","tabs","default_view","add","title","body","closing_events","refresh","window","setTimeout","current_user","currUser"],"mappings":"AACAA,QAAQ,cACA,kBACA,iBACA,2BACA,kCACA,SAAYC,EACAC,EACAC,EACAC,EACAC,GACpB,MAAOC,UAASC,KAAKC,QAEjBC,SACIC,kBAAsB,GACtBC,gBAAsB,MACtBC,eAAsB,IACtBC,kBAAsB,OACtBC,OAAsB,IACtBC,MAAsB,IACtBC,MACIC,GAAc,OACdC,KAAc,cACdC,YAAc,wZAKtBC,MAAO,KAGPC,UAAW,KAGXC,gBAAiB,KAGjBC,mBAGAC,gBAGAC,WAAY,SAAShB,GAEjB,GAAIiB,GAAOC,IAGXA,MAAKlB,QAAUR,EAAM2B,MAAMnB,EAASkB,KAAKlB,SAGzCkB,KAAKN,UAAY,GAAIjB,GAAayB,MAGlCF,KAAKG,eAAiB,GAAI1B,GAAaG,MACnCwB,MAAcJ,KAAKN,UACnBW,QAAc,SAASC,GACnBA,EAAEC,iBACFR,EAAKS,QAETC,SAAc,eAQlBC,EAAE,uBAAuBC,OAAOX,KAAKG,eAAeS,IAGpD,IAAIb,GAAOC,IACX1B,GAAMuC,KACFC,IAAUC,cAAcC,KAAO,qCAC/BC,QAAU,SAASC,GACf,IAAKC,MAAOD,GACRnB,EAAKH,gBAAgBwB,MACjB9B,GAAkB4B,EAAUC,KAAKE,UACjC9B,KAAkB2B,EAAUC,KAAKE,UACjC7B,YAAkB0B,EAAUC,KAAK3B,YACjC8B,gBAAkBJ,EAAUC,KAAKG,iBAKzCvB,GAAKH,gBAAgB2B,KAAK,SAASC,EAAGC,GAClC,MAAOD,GAAEjC,KAAOkC,EAAElC,KAAO,EAAIiC,EAAEjC,KAAOkC,EAAElC,KAAO,GAAK,IAInDQ,EAAKjB,QAAQ4C,wBACd3B,EAAKH,gBAAgB+B,QAAQ5B,EAAKjB,QAAQO,SAMtDf,EAAMuC,KACFC,IAAUC,cAAcC,KAAO,cAC/BC,QAAU,SAASW,GACf,IAAKT,MAAOS,GACR7B,EAAKF,aAAauB,MACd9B,GAAUsC,EAAQT,KAAK,GACvB5B,KAAUqC,EAAQT,KAAK,IAK/BpB,GAAKF,aAAa0B,KAAK,SAASC,EAAGC,GAC/B,MAAID,GAAElC,IAAMS,EAAKjB,QAAQG,eAAyB,GAC9CwC,EAAEnC,IAAMS,EAAKjB,QAAQG,eAAyB,EAC3CuC,EAAEjC,KAAOkC,EAAElC,KAAO,EAAIiC,EAAEjC,KAAOkC,EAAElC,KAAO,GAAK,QAWpEiB,KAAM,WAEF,GAAIT,GAAOC,IACX,OAAK6B,QAAOC,kBAAqBD,OAAOC,iBAAiB1B,OAMpDJ,KAAKP,QAENO,KAAK+B,KAAO,GAAIvD,GAAKI,KAGrBoB,KAAKgC,aAAe,GAAItD,GAAkBsB,MAC1CA,KAAK+B,KAAKE,KACN3C,GAAU,UACV4C,MAAU,UACVtB,IAAUZ,KAAKgC,aAAapB,MAIhCZ,KAAKP,MAAQ,GAAIlB,GAAMK,MACnBsD,MAAkB,iEAClBC,KAAkBnC,KAAK+B,KAAKnB,IAC5BzB,OAAkBa,KAAKlB,QAAQK,OAC/BC,MAAkBY,KAAKlB,QAAQM,MAC/BgD,gBAAkB,IAItBpC,KAAKqC,eAITrC,MAAKP,MAAMe,YA/BP8B,QAAOC,WAAW,WAAaxC,EAAKS,QAAU,MAmCtD6B,QAAS,WACLrC,KAAKwC,aAAeX,OAAOY,SAAS5B,IAAI,MACxCb,KAAKL,gBAAkB,KACnBK,KAAKwC,eACLxC,KAAKL,gBAAkBkC,OAAOC,iBAAiB1B,MAAMS,IAAI"} \ No newline at end of file diff --git a/static/scripts/mvc/upload/upload-settings.js b/static/scripts/mvc/upload/upload-settings.js index 5d63fefc4ba..2146fdc68e1 100644 --- a/static/scripts/mvc/upload/upload-settings.js +++ b/static/scripts/mvc/upload/upload-settings.js @@ -1,2 +1,2 @@ -define(["utils/utils"],function(){return Backbone.View.extend({options:{class_check:"upload-icon-button fa fa-check-square-o",class_uncheck:"upload-icon-button fa fa-square-o"},initialize:function(a){this.app=a;var b=this;this.setElement(this._template()),this.model=this.app.model,this.$el.find("#upload-space-to-tabs").on("click",function(){b._switchState("#upload-space-to-tabs","space_to_tabs")}),this.$el.find("#upload-to-posix-lines").on("click",function(){b._switchState("#upload-to-posix-lines","to_posix_lines")}),this.render()},events:{mousedown:function(a){a.preventDefault()}},render:function(){this._renderState("#upload-space-to-tabs",this.model.get("space_to_tabs")),this._renderState("#upload-to-posix-lines",this.model.get("to_posix_lines"));var a=this.$el.find("#upload-settings-cover");"init"!=this.model.get("status")?a.show():a.hide()},_switchState:function(a,b){if("init"==this.model.get("status")){var c=!this.model.get(b);this.model.set(b,c),this._renderState(a,c)}},_renderState:function(a,b){var c=this.$el.find(a);c.removeClass(),c.addClass(b?this.options.class_check:this.options.class_uncheck)},_template:function(){return'
Convert spaces to tabs
Use POSIX standard
'}})}); +define(["utils/utils"],function(){return Backbone.View.extend({options:{class_check:"upload-icon-button fa fa-check-square-o",class_uncheck:"upload-icon-button fa fa-square-o"},initialize:function(a){this.app=a;var b=this;this.setElement(this._template()),this.model=this.app.model,this.$("#upload-space-to-tabs").on("click",function(){b._switchState("#upload-space-to-tabs","space_to_tabs")}),this.$("#upload-to-posix-lines").on("click",function(){b._switchState("#upload-to-posix-lines","to_posix_lines")}),this.render()},events:{mousedown:function(a){a.preventDefault()}},render:function(){this._renderState("#upload-space-to-tabs",this.model.get("space_to_tabs")),this._renderState("#upload-to-posix-lines",this.model.get("to_posix_lines"));var a=this.$("#upload-settings-cover");"init"!=this.model.get("status")?a.show():a.hide()},_switchState:function(a,b){if("init"==this.model.get("status")){var c=!this.model.get(b);this.model.set(b,c),this._renderState(a,c)}},_renderState:function(a,b){var c=this.$(a);c.removeClass(),c.addClass(b?this.options.class_check:this.options.class_uncheck)},_template:function(){return'
Convert spaces to tabs
Use POSIX standard
'}})}); //# sourceMappingURL=../../../maps/mvc/upload/upload-settings.js.map \ No newline at end of file diff --git a/static/scripts/mvc/upload/upload-view-default.js b/static/scripts/mvc/upload/upload-view-default.js index 7265eefa6a5..57af310d544 100644 --- a/static/scripts/mvc/upload/upload-view-default.js +++ b/static/scripts/mvc/upload/upload-view-default.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/upload/upload-model","mvc/upload/upload-row","mvc/upload/upload-ftp","mvc/ui/ui-popover","mvc/ui/ui-select","utils/uploadbox"],function(a,b,c,d,e,f){return Backbone.View.extend({default_extension:"auto",default_genome:"?",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."},select_extension:null,select_genome:null,uploadbox:null,upload_size:0,collection:new b.Collection,ftp:null,counter:{announce:0,success:0,error:0,running:0,reset:function(){this.announce=this.success=this.error=this.running=0}},initialize:function(a){var b=this;this.app=a,this.setElement(this._template("upload-box","upload-info"));var b=this;this.uploadbox=this.$el.uploadbox({announce:function(a,c,d){b._eventAnnounce(a,c,d)},initialize:function(a,c,d){return b._eventInitialize(a,c,d)},progress:function(a,c,d){b._eventProgress(a,c,d)},success:function(a,c,d){b._eventSuccess(a,c,d)},error:function(a,c,d){b._eventError(a,c,d)},complete:function(){b._eventComplete()}}),this.select_extension=new f.View({css:"header-selection",data:this.app.list_extensions,container:this.$el.find("#header-extension"),value:this.default_extension,onchange:function(a){b.updateExtension(a)}}),b.$el.parent().find("#header-extension-info").on("click",function(a){b._showExtensionInfo({$el:$(a.target),title:b.select_extension.text(),extension:b.select_extension.value(),placement:"top"})}).on("mousedown",function(a){a.preventDefault()}),this.select_genome=new f.View({css:"header-selection",data:this.app.list_genomes,container:this.$el.find("#header-genome"),value:this.default_genome,onchange:function(a){b.updateGenome(a)}}),this._updateScreen(),this.collection.on("remove",function(a){b._eventRemove(a)})},_eventRemove:function(a){var b=a.get("status");"success"==b?this.counter.success--:"error"==b?this.counter.error--:this.counter.announce--,this._updateScreen(),this.uploadbox.remove(a.id)},_eventAnnounce:function(a,b){this.counter.announce++,this._updateScreen();var d=new c(this,{id:a,file_name:b.name,file_size:b.size,file_mode:b.mode,file_path:b.path});this.collection.add(d.model),$(this.el).find("tbody:first").append(d.$el),d.render()},_eventInitialize:function(a,b){var c=this.collection.get(a);c.set("status","running");var d=(c.get("file_name"),c.get("file_path")),e=c.get("file_mode"),f=c.get("extension"),g=c.get("genome"),h=c.get("url_paste"),i=c.get("space_to_tabs"),j=c.get("to_posix_lines");return h||b.size>0?(this.uploadbox.configure({url:this.app.options.nginx_upload_path}),this.uploadbox.configure("local"==e?{paramname:"files_0|file_data"}:{paramname:null}),tool_input={},"new"==e&&(tool_input["files_0|url_paste"]=h),"ftp"==e&&(tool_input["files_0|ftp_files"]=d),tool_input.dbkey=g,tool_input.file_type=f,tool_input["files_0|type"]="upload_dataset",tool_input["files_0|space_to_tab"]=i&&"Yes"||null,tool_input["files_0|to_posix_lines"]=j&&"Yes"||null,data={},data.history_id=this.current_history,data.tool_id="upload1",data.inputs=JSON.stringify(tool_input),data):null},_eventProgress:function(a,b,c){var d=this.collection.get(a);d.set("percentage",c),this.ui_button.set("percentage",this._uploadPercentage(c,b.size))},_eventSuccess:function(a){var b=this.collection.get(a);b.set("percentage",100),b.set("status","success");var c=b.get("file_size");this.ui_button.set("percentage",this._uploadPercentage(100,c)),this.upload_completed+=100*c,this.counter.announce--,this.counter.success++,this._updateScreen(),Galaxy.currHistoryPanel.refreshContents()},_eventError:function(a,b,c){var d=this.collection.get(a);d.set("percentage",100),d.set("status","error"),d.set("info",c),this.ui_button.set("percentage",this._uploadPercentage(100,b.size)),this.ui_button.set("status","danger"),this.upload_completed+=100*b.size,this.counter.announce--,this.counter.error++,this._updateScreen()},_eventComplete:function(){this.collection.each(function(a){"queued"==a.get("status")&&a.set("status","init")}),this.counter.running=0,this._updateScreen()},_showExtensionInfo:function(a){var b=this,c=a.$el,d=a.extension,f=a.title,g=_.findWhere(b.list_extensions,{id:d});this.extension_popup&&this.extension_popup.remove(),this.extension_popup=new e.View({placement:a.placement||"bottom",container:c,destroy:!0}),this.extension_popup.title(f),this.extension_popup.empty(),this.extension_popup.append(this._templateDescription(g)),this.extension_popup.show()},_eventFtp:function(){this.ftp.visible?this.ftp.hide():(this.ftp.empty(),this.ftp.append(new d(this).$el),this.ftp.show())},_eventCreate:function(){this.uploadbox.add([{name:"New File",size:0,mode:"new"}])},_eventStart:function(){if(!(0==this.counter.announce||this.counter.running>0)){var a=this;this.upload_size=0,this.upload_completed=0,this.collection.each(function(b){"init"==b.get("status")&&(b.set("status","queued"),a.upload_size+=b.get("file_size"))}),this.ui_button.set("percentage",0),this.ui_button.set("status","success"),this.counter.running=this.counter.announce,this._updateScreen(),this.uploadbox.start()}},_eventStop:function(){0!=this.counter.running&&(this.ui_button.set("status","info"),this.uploadbox.stop(),$("#upload-info").html("Queue will pause after completing the current file..."))},_eventReset:function(){0==this.counter.running&&(this.collection.reset(),this.counter.reset(),this._updateScreen(),this.uploadbox.reset(),this.select_extension.value(this.default_extension),this.select_genome.value(this.default_genome),this.ui_button.set("percentage",0))},updateExtension:function(a,b){var c=this;this.collection.each(function(d){"init"!=d.get("status")||d.get("extension")!=c.default_extension&&b||d.set("extension",a)})},updateGenome:function(a,b){var c=this;this.collection.each(function(d){"init"!=d.get("status")||d.get("genome")!=c.default_genome&&b||d.set("genome",a)})},_updateScreen:function(){message=0==this.counter.announce?this.uploadbox.compatible()?"You can Drag & Drop files into this box.":"Unfortunately, your browser does not support multiple file uploads or drag&drop.
Some supported browsers are: Firefox 4+, Chrome 7+, IE 10+, Opera 12+ or Safari 6+.":0==this.counter.running?"You added "+this.counter.announce+" file(s) to the queue. Add more files or click 'Start' to proceed.":"Please wait..."+this.counter.announce+" out of "+this.counter.running+" remaining.",$("#upload-info").html(message)},_uploadPercentage:function(a,b){return(this.upload_completed+a*b)/this.upload_size},_templateDescription:function(a){if(a.description){var b=a.description;return a.description_url&&(b+=' (read more)'),b}return"There is no description available for this file extension."},_template:function(a,b){return'
Type (set all): Genome (set all):
'}})}); +define(["utils/utils","mvc/upload/upload-model","mvc/upload/upload-row","mvc/upload/upload-ftp","mvc/ui/ui-popover","mvc/ui/ui-select","mvc/ui/ui-misc","utils/uploadbox"],function(a,b,c,d,e,f,g){return Backbone.View.extend({select_extension:null,select_genome:null,uploadbox:null,upload_size:0,collection:new b.Collection,ftp:null,counter:{announce:0,success:0,error:0,running:0,reset:function(){this.announce=this.success=this.error=this.running=0}},initialize:function(a){this.app=a,this.options=a.options,this.list_extensions=a.list_extensions,this.list_genomes=a.list_genomes,this.ui_button=a.ui_button;var b=this;this.setElement(this._template()),this.btnLocal=new g.Button({title:"Choose local file",onclick:function(){b.uploadbox.select()}}),this.btnFtp=new g.Button({title:"Choose FTP file",onclick:function(){b._eventFtp()}}),this.btnCreate=new g.Button({title:"Paste/Fetch data",onclick:function(){b._eventCreate()}}),this.btnStart=new g.Button({title:"Start",onclick:function(){b._eventStart()}}),this.btnStop=new g.Button({title:"Pause",onclick:function(){b._eventStop()}}),this.btnReset=new g.Button({title:"Reset",onclick:function(){b._eventReset()}}),this.btnClose=new g.Button({title:"Close",onclick:function(){b.app.modal.hide()}});var c=[this.btnLocal,this.btnFtp,this.btnCreate,this.btnStart,this.btnStop,this.btnReset,this.btnClose];for(var d in c)this.$("#upload-buttons").prepend(c[d].$el);var b=this;this.uploadbox=this.$el.uploadbox({announce:function(a,c,d){b._eventAnnounce(a,c,d)},initialize:function(a,c,d){return b._eventInitialize(a,c,d)},progress:function(a,c,d){b._eventProgress(a,c,d)},success:function(a,c,d){b._eventSuccess(a,c,d)},error:function(a,c,d){b._eventError(a,c,d)},complete:function(){b._eventComplete()}}),this.ftp=new e.View({title:"FTP files",container:this.btnFtp.$el}),this.select_extension=new f.View({css:"footer-selection",container:this.$("#footer-extension"),data:this.list_extensions,value:this.options.default_extension,onchange:function(a){b.updateExtension(a)}}),b.$("#footer-extension-info").on("click",function(a){b.showExtensionInfo({$el:$(a.target),title:b.select_extension.text(),extension:b.select_extension.value(),placement:"top"})}).on("mousedown",function(a){a.preventDefault()}),this.select_genome=new f.View({css:"footer-selection",container:this.$("#footer-genome"),data:this.list_genomes,value:this.options.default_genome,onchange:function(a){b.updateGenome(a)}}),this._updateScreen(),this.collection.on("remove",function(a){b._eventRemove(a)})},_eventRemove:function(a){var b=a.get("status");"success"==b?this.counter.success--:"error"==b?this.counter.error--:this.counter.announce--,this._updateScreen(),this.uploadbox.remove(a.id)},_eventAnnounce:function(a,b){this.counter.announce++,this._updateScreen();var d=new c(this,{id:a,file_name:b.name,file_size:b.size,file_mode:b.mode,file_path:b.path});this.collection.add(d.model),this.$("#upload-table > tbody:first").append(d.$el),d.render()},_eventInitialize:function(a,b){var c=this.collection.get(a);c.set("status","running");var d=(c.get("file_name"),c.get("file_path")),e=c.get("file_mode"),f=c.get("extension"),g=c.get("genome"),h=c.get("url_paste"),i=c.get("space_to_tabs"),j=c.get("to_posix_lines");return h||b.size>0?(this.uploadbox.configure({url:this.app.options.nginx_upload_path}),this.uploadbox.configure("local"==e?{paramname:"files_0|file_data"}:{paramname:null}),tool_input={},"new"==e&&(tool_input["files_0|url_paste"]=h),"ftp"==e&&(tool_input["files_0|ftp_files"]=d),tool_input.dbkey=g,tool_input.file_type=f,tool_input["files_0|type"]="upload_dataset",tool_input["files_0|space_to_tab"]=i&&"Yes"||null,tool_input["files_0|to_posix_lines"]=j&&"Yes"||null,data={},data.history_id=this.current_history,data.tool_id="upload1",data.inputs=JSON.stringify(tool_input),data):null},_eventProgress:function(a,b,c){var d=this.collection.get(a);d.set("percentage",c),this.ui_button.set("percentage",this._uploadPercentage(c,b.size))},_eventSuccess:function(a){var b=this.collection.get(a);b.set("percentage",100),b.set("status","success");var c=b.get("file_size");this.ui_button.set("percentage",this._uploadPercentage(100,c)),this.upload_completed+=100*c,this.counter.announce--,this.counter.success++,this._updateScreen(),Galaxy.currHistoryPanel.refreshContents()},_eventError:function(a,b,c){var d=this.collection.get(a);d.set("percentage",100),d.set("status","error"),d.set("info",c),this.ui_button.set("percentage",this._uploadPercentage(100,b.size)),this.ui_button.set("status","danger"),this.upload_completed+=100*b.size,this.counter.announce--,this.counter.error++,this._updateScreen()},_eventComplete:function(){this.collection.each(function(a){"queued"==a.get("status")&&a.set("status","init")}),this.counter.running=0,this._updateScreen()},showExtensionInfo:function(a){var b=this,c=a.$el,d=a.extension,f=a.title,g=_.findWhere(b.list_extensions,{id:d});this.extension_popup&&this.extension_popup.remove(),this.extension_popup=new e.View({placement:a.placement||"bottom",container:c,destroy:!0}),this.extension_popup.title(f),this.extension_popup.empty(),this.extension_popup.append(this._templateDescription(g)),this.extension_popup.show()},_eventFtp:function(){this.ftp.visible?this.ftp.hide():(this.ftp.empty(),this.ftp.append(new d(this).$el),this.ftp.show())},_eventCreate:function(){this.uploadbox.add([{name:"New File",size:0,mode:"new"}])},_eventStart:function(){if(!(0==this.counter.announce||this.counter.running>0)){var a=this;this.upload_size=0,this.upload_completed=0,this.collection.each(function(b){"init"==b.get("status")&&(b.set("status","queued"),a.upload_size+=b.get("file_size"))}),this.ui_button.set("percentage",0),this.ui_button.set("status","success"),this.counter.running=this.counter.announce,this._updateScreen(),this.uploadbox.start()}},_eventStop:function(){0!=this.counter.running&&(this.ui_button.set("status","info"),this.uploadbox.stop(),$("#upload-info").html("Queue will pause after completing the current file..."))},_eventReset:function(){0==this.counter.running&&(this.collection.reset(),this.counter.reset(),this._updateScreen(),this.uploadbox.reset(),this.select_extension.value(this.options.default_extension),this.select_genome.value(this.options.default_genome),this.ui_button.set("percentage",0))},updateExtension:function(a,b){var c=this;this.collection.each(function(d){"init"!=d.get("status")||d.get("extension")!=c.options.default_extension&&b||d.set("extension",a)})},updateGenome:function(a,b){var c=this;this.collection.each(function(d){"init"!=d.get("status")||d.get("genome")!=c.options.default_genome&&b||d.set("genome",a)})},_updateScreen:function(){message=0==this.counter.announce?this.uploadbox.compatible()?"You can Drag & Drop files into this box.":"Unfortunately, your browser does not support multiple file uploads or drag&drop.
Some supported browsers are: Firefox 4+, Chrome 7+, IE 10+, Opera 12+ or Safari 6+.":0==this.counter.running?"You added "+this.counter.announce+" file(s) to the queue. Add more files or click 'Start' to proceed.":"Please wait..."+this.counter.announce+" out of "+this.counter.running+" remaining.",this.$("#upload-info").html(message),this.counter.announce+this.counter.success+this.counter.error>0?this.$("#upload-table").show():this.$("#upload-table").hide()},_uploadPercentage:function(a,b){return(this.upload_completed+a*b)/this.upload_size},_templateDescription:function(a){if(a.description){var b=a.description;return a.description_url&&(b+=' (read more)'),b}return"There is no description available for this file extension."},_template:function(){return'
'}})}); //# sourceMappingURL=../../../maps/mvc/upload/upload-view-default.js.map \ 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 830da5f3df1..f481e00ee11 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:"",default_genome:"?"},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.textb.text?1:a.textb.text?1:a.text