From 95507c5d02cd56199c232a8cd829e46c3f43ef7a Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Mon, 23 Nov 2015 15:07:40 -0500 Subject: [PATCH 1/7] fix whitespace --- .../scripts/mvc/library/library-folderrow-view.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/galaxy/scripts/mvc/library/library-folderrow-view.js b/client/galaxy/scripts/mvc/library/library-folderrow-view.js index 6c357d1458d..7d5eef4eedf 100644 --- a/client/galaxy/scripts/mvc/library/library-folderrow-view.js +++ b/client/galaxy/scripts/mvc/library/library-folderrow-view.js @@ -66,7 +66,7 @@ var FolderRowView = Backbone.View.extend({ var dataset_id = $(event.target).closest('tr')[0].id; var dataset = Galaxy.libraries.folderListView.collection.get(dataset_id); dataset.url = dataset.urlRoot + dataset.id + '?undelete=true'; - dataset.destroy({ + dataset.destroy({ success : function(model, response){ Galaxy.libraries.folderListView.collection.remove(dataset_id); var updated_dataset = new mod_library_model.Item(response); @@ -76,7 +76,7 @@ var FolderRowView = Backbone.View.extend({ var folder_id = that.model.get('folder_id'); window.location='#folders/' + folder_id + '/datasets/' + that.id; }}); - }, + }, error : function(model, response){ if (typeof response.responseJSON !== "undefined"){ mod_toastr.error('Dataset was not undeleted. ' + response.responseJSON.err_msg); @@ -103,7 +103,7 @@ var FolderRowView = Backbone.View.extend({ Galaxy.libraries.folderListView.collection.add(updated_folder); Galaxy.libraries.folderListView.collection.sortByNameAsc(); mod_toastr.success('Folder undeleted.'); - }, + }, error : function(model, response){ if (typeof response.responseJSON !== "undefined"){ mod_toastr.error('Folder was not undeleted. ' + response.responseJSON.err_msg); @@ -157,7 +157,7 @@ var FolderRowView = Backbone.View.extend({ tmpl_array.push(''); return _.template(tmpl_array.join('')); - }, + }, templateRowDeletedFile: function(){ tmpl_array = []; @@ -196,7 +196,7 @@ var FolderRowView = Backbone.View.extend({ return _.template(tmpl_array.join('')); } - + }); return { From e142beaffe1ee6aa853bbdb211ccf3fe1beb509e Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Mon, 23 Nov 2015 15:08:25 -0500 Subject: [PATCH 2/7] replace wrong class name --- client/galaxy/scripts/mvc/library/library-folderrow-view.js | 2 +- static/maps/mvc/library/library-folderrow-view.js.map | 2 +- static/scripts/mvc/library/library-folderrow-view.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/galaxy/scripts/mvc/library/library-folderrow-view.js b/client/galaxy/scripts/mvc/library/library-folderrow-view.js index 7d5eef4eedf..c58080c7853 100644 --- a/client/galaxy/scripts/mvc/library/library-folderrow-view.js +++ b/client/galaxy/scripts/mvc/library/library-folderrow-view.js @@ -180,7 +180,7 @@ var FolderRowView = Backbone.View.extend({ templateRowDeletedFolder: function(){ tmpl_array = []; - tmpl_array.push(''); + tmpl_array.push(''); tmpl_array.push(' '); tmpl_array.push(' '); tmpl_array.push(' '); diff --git a/static/maps/mvc/library/library-folderrow-view.js.map b/static/maps/mvc/library/library-folderrow-view.js.map index ef741012f21..c4122ea9e53 100644 --- a/static/maps/mvc/library/library-folderrow-view.js.map +++ b/static/maps/mvc/library/library-folderrow-view.js.map @@ -1 +1 @@ -{"version":3,"file":"library-folderrow-view.js","sources":["../../../src/mvc/library/library-folderrow-view.js"],"names":["define","mod_masthead","mod_utils","mod_toastr","mod_library_model","mod_library_dataset_view","FolderRowView","Backbone","View","extend","lastSelectedHistory","events","click .undelete_dataset_btn","click .undelete_folder_btn","options","type","initialize","folder_item","this","model","render","template","get","templateRowDeletedFolder","templateRowFolder","templateRowDeletedFile","templateRowFile","console","error","setElement","content_item","$el","show","showDatasetDetails","Galaxy","libraries","datasetView","LibraryDatasetView","id","undeleteDataset","event","$","hide","that","dataset_id","target","closest","dataset","folderListView","collection","url","urlRoot","destroy","success","response","remove","updated_dataset","Item","add","sortByNameAsc","onclick","folder_id","window","location","responseJSON","err_msg","undeleteFolder","folder","updated_folder","FolderAsModel","tmpl_array","push","_","join"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"library-folderrow-view.js","sources":["../../../src/mvc/library/library-folderrow-view.js"],"names":["define","mod_masthead","mod_utils","mod_toastr","mod_library_model","mod_library_dataset_view","FolderRowView","Backbone","View","extend","lastSelectedHistory","events","click .undelete_dataset_btn","click .undelete_folder_btn","options","type","initialize","folder_item","this","model","render","template","get","templateRowDeletedFolder","templateRowFolder","templateRowDeletedFile","templateRowFile","console","error","setElement","content_item","$el","show","showDatasetDetails","Galaxy","libraries","datasetView","LibraryDatasetView","id","undeleteDataset","event","$","hide","that","dataset_id","target","closest","dataset","folderListView","collection","url","urlRoot","destroy","success","response","remove","updated_dataset","Item","add","sortByNameAsc","onclick","folder_id","window","location","responseJSON","err_msg","undeleteFolder","folder","updated_folder","FolderAsModel","tmpl_array","push","_","join"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/library/library-folderrow-view.js b/static/scripts/mvc/library/library-folderrow-view.js index d9683065d0d..f7c503684d7 100644 --- a/static/scripts/mvc/library/library-folderrow-view.js +++ b/static/scripts/mvc/library/library-folderrow-view.js @@ -1,2 +1,2 @@ -define(["galaxy.masthead","utils/utils","libs/toastr","mvc/library/library-model","mvc/library/library-dataset-view"],function(a,b,c,d,e){var f=Backbone.View.extend({lastSelectedHistory:"",events:{"click .undelete_dataset_btn":"undeleteDataset","click .undelete_folder_btn":"undeleteFolder"},options:{type:null},initialize:function(a){this.model=a,this.render(a)},render:function(a){var b=null;return"folder"===a.get("type")||"LibraryFolder"===a.get("model_class")?(this.options.type="folder",b=a.get("deleted")?this.templateRowDeletedFolder():this.templateRowFolder()):"file"===a.get("type")||"LibraryDatasetDatasetAssociation"===a.get("model_class")?(this.options.type="file",b=a.get("deleted")?this.templateRowDeletedFile():this.templateRowFile()):(console.error("Unknown library item type found."),console.error(a.get("type")||a.get("model_class"))),this.setElement(b({content_item:a})),this.$el.show(),this},showDatasetDetails:function(){Galaxy.libraries.datasetView=new e.LibraryDatasetView({id:this.id})},undeleteDataset:function(a){$(".tooltip").hide();var b=this,e=$(a.target).closest("tr")[0].id,f=Galaxy.libraries.folderListView.collection.get(e);f.url=f.urlRoot+f.id+"?undelete=true",f.destroy({success:function(a,f){Galaxy.libraries.folderListView.collection.remove(e);var g=new d.Item(f);Galaxy.libraries.folderListView.collection.add(g),Galaxy.libraries.folderListView.collection.sortByNameAsc(),c.success("Dataset undeleted. Click this to see it.","",{onclick:function(){var a=b.model.get("folder_id");window.location="#folders/"+a+"/datasets/"+b.id}})},error:function(a,b){c.error("undefined"!=typeof b.responseJSON?"Dataset was not undeleted. "+b.responseJSON.err_msg:"An error occured! Dataset was not undeleted. Please try again.")}})},undeleteFolder:function(a){$(".tooltip").hide();var b=$(a.target).closest("tr")[0].id,e=Galaxy.libraries.folderListView.collection.get(b);e.url=e.urlRoot+e.id+"?undelete=true",e.destroy({success:function(a,e){Galaxy.libraries.folderListView.collection.remove(b);var f=new d.FolderAsModel(e);Galaxy.libraries.folderListView.collection.add(f),Galaxy.libraries.folderListView.collection.sortByNameAsc(),c.success("Folder undeleted.")},error:function(a,b){c.error("undefined"!=typeof b.responseJSON?"Folder was not undeleted. "+b.responseJSON.err_msg:"An error occured! Folder was not undeleted. Please try again.")}})},templateRowFolder:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' <%- content_item.get("name") %>'),tmpl_array.push(" "),tmpl_array.push(" folder"),tmpl_array.push(" "),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(" "),tmpl_array.push(' <% if (content_item.get("can_manage")) { %><% } %>'),tmpl_array.push(" "),tmpl_array.push(""),_.template(tmpl_array.join(""))},templateRowFile:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(' /datasets/<%- content_item.id %>" class="library-dataset"><%- content_item.get("name") %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_ext")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_size")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(" "),tmpl_array.push(' <% if (content_item.get("is_unrestricted")) { %><% } %>'),tmpl_array.push(' <% if (content_item.get("is_private")) { %><% } %>'),tmpl_array.push(' <% if ((content_item.get("is_unrestricted") === false) && (content_item.get("is_private") === false)) { %><% } %>'),tmpl_array.push(' <% if (content_item.get("can_manage")) { %>/datasets/<%- content_item.id %>/permissions"><% } %>'),tmpl_array.push(" "),tmpl_array.push(""),_.template(tmpl_array.join(""))},templateRowDeletedFile:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(" "),tmpl_array.push(' <%- content_item.get("name") %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_ext")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_size")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(' '),tmpl_array.push(""),_.template(tmpl_array.join(""))},templateRowDeletedFolder:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(' <%- content_item.get("name") %>'),tmpl_array.push(" "),tmpl_array.push(" folder"),tmpl_array.push(" "),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(' '),tmpl_array.push(""),_.template(tmpl_array.join(""))}});return{FolderRowView:f}}); +define(["galaxy.masthead","utils/utils","libs/toastr","mvc/library/library-model","mvc/library/library-dataset-view"],function(a,b,c,d,e){var f=Backbone.View.extend({lastSelectedHistory:"",events:{"click .undelete_dataset_btn":"undeleteDataset","click .undelete_folder_btn":"undeleteFolder"},options:{type:null},initialize:function(a){this.model=a,this.render(a)},render:function(a){var b=null;return"folder"===a.get("type")||"LibraryFolder"===a.get("model_class")?(this.options.type="folder",b=a.get("deleted")?this.templateRowDeletedFolder():this.templateRowFolder()):"file"===a.get("type")||"LibraryDatasetDatasetAssociation"===a.get("model_class")?(this.options.type="file",b=a.get("deleted")?this.templateRowDeletedFile():this.templateRowFile()):(console.error("Unknown library item type found."),console.error(a.get("type")||a.get("model_class"))),this.setElement(b({content_item:a})),this.$el.show(),this},showDatasetDetails:function(){Galaxy.libraries.datasetView=new e.LibraryDatasetView({id:this.id})},undeleteDataset:function(a){$(".tooltip").hide();var b=this,e=$(a.target).closest("tr")[0].id,f=Galaxy.libraries.folderListView.collection.get(e);f.url=f.urlRoot+f.id+"?undelete=true",f.destroy({success:function(a,f){Galaxy.libraries.folderListView.collection.remove(e);var g=new d.Item(f);Galaxy.libraries.folderListView.collection.add(g),Galaxy.libraries.folderListView.collection.sortByNameAsc(),c.success("Dataset undeleted. Click this to see it.","",{onclick:function(){var a=b.model.get("folder_id");window.location="#folders/"+a+"/datasets/"+b.id}})},error:function(a,b){c.error("undefined"!=typeof b.responseJSON?"Dataset was not undeleted. "+b.responseJSON.err_msg:"An error occured! Dataset was not undeleted. Please try again.")}})},undeleteFolder:function(a){$(".tooltip").hide();var b=$(a.target).closest("tr")[0].id,e=Galaxy.libraries.folderListView.collection.get(b);e.url=e.urlRoot+e.id+"?undelete=true",e.destroy({success:function(a,e){Galaxy.libraries.folderListView.collection.remove(b);var f=new d.FolderAsModel(e);Galaxy.libraries.folderListView.collection.add(f),Galaxy.libraries.folderListView.collection.sortByNameAsc(),c.success("Folder undeleted.")},error:function(a,b){c.error("undefined"!=typeof b.responseJSON?"Folder was not undeleted. "+b.responseJSON.err_msg:"An error occured! Folder was not undeleted. Please try again.")}})},templateRowFolder:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' <%- content_item.get("name") %>'),tmpl_array.push(" "),tmpl_array.push(" folder"),tmpl_array.push(" "),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(" "),tmpl_array.push(' <% if (content_item.get("can_manage")) { %><% } %>'),tmpl_array.push(" "),tmpl_array.push(""),_.template(tmpl_array.join(""))},templateRowFile:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(' /datasets/<%- content_item.id %>" class="library-dataset"><%- content_item.get("name") %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_ext")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_size")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(" "),tmpl_array.push(' <% if (content_item.get("is_unrestricted")) { %><% } %>'),tmpl_array.push(' <% if (content_item.get("is_private")) { %><% } %>'),tmpl_array.push(' <% if ((content_item.get("is_unrestricted") === false) && (content_item.get("is_private") === false)) { %><% } %>'),tmpl_array.push(' <% if (content_item.get("can_manage")) { %>/datasets/<%- content_item.id %>/permissions"><% } %>'),tmpl_array.push(" "),tmpl_array.push(""),_.template(tmpl_array.join(""))},templateRowDeletedFile:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(" "),tmpl_array.push(' <%- content_item.get("name") %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_ext")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("file_size")) %>'),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(' '),tmpl_array.push(""),_.template(tmpl_array.join(""))},templateRowDeletedFolder:function(){return tmpl_array=[],tmpl_array.push(''),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(" "),tmpl_array.push(" "),tmpl_array.push(' '),tmpl_array.push(' <%- content_item.get("name") %>'),tmpl_array.push(" "),tmpl_array.push(" folder"),tmpl_array.push(" "),tmpl_array.push(' <%= _.escape(content_item.get("update_time")) %>'),tmpl_array.push(' '),tmpl_array.push(""),_.template(tmpl_array.join(""))}});return{FolderRowView:f}}); //# sourceMappingURL=../../../maps/mvc/library/library-folderrow-view.js.map \ No newline at end of file From 39bc057ef9d9e62f08e3c0dbdb95d14a1ae295d2 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Mon, 23 Nov 2015 15:12:05 -0500 Subject: [PATCH 3/7] fix whitespace --- .../mvc/library/library-foldertoolbar-view.js | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js index b81a839ed7b..e718ead48b2 100644 --- a/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js +++ b/client/galaxy/scripts/mvc/library/library-foldertoolbar-view.js @@ -63,7 +63,7 @@ var FolderToolbarView = Backbone.View.extend({ ' to set your data to the format you think it should be.' + ' You can also upload compressed files, which will automatically be decompressed.' }, - + // genomes list_genomes : [], @@ -99,7 +99,7 @@ var FolderToolbarView = Backbone.View.extend({ renderPaginator: function( options ){ this.options = _.extend( this.options, options ); var paginator_template = this.templatePaginator(); - this.$el.find( '#folder_paginator' ).html( paginator_template({ + this.$el.find( '#folder_paginator' ).html( paginator_template({ id: this.options.id, show_page: parseInt( this.options.show_page ), page_count: parseInt( this.options.page_count ), @@ -281,7 +281,7 @@ var FolderToolbarView = Backbone.View.extend({ } this.initChainCallControl( { length: datasets_to_import.length, action: 'to_history', history_name: history_name } ); - // set the used history as current so user will see the last one + // set the used history as current so user will see the last one // that he imported into in the history panel on the 'analysis' page jQuery.getJSON( galaxy_config.root + 'history/set_as_current?id=' + history_id ); this.chainCallImportingIntoHistory( datasets_to_import, history_name ); @@ -360,7 +360,7 @@ var FolderToolbarView = Backbone.View.extend({ Galaxy.libraries.library_router.back(); } }); - + // user should always have a history, even anonymous user if (self.histories.models.length > 0){ self.fetchAndDisplayHistoryContents(self.histories.models[0].id); @@ -393,7 +393,7 @@ var FolderToolbarView = Backbone.View.extend({ // TODO: should not trigger routes outside of the router Galaxy.libraries.library_router.navigate( 'folders/' + that.id, { trigger: true } ); } - }); + }); this.renderSelectBoxes(); }, @@ -439,7 +439,7 @@ var FolderToolbarView = Backbone.View.extend({ renderSelectBoxes: function(){ // This won't work properly unlesss we already have the data fetched. // See this.fetchExtAndGenomes() - // TODO switch to common resources: + // TODO switch to common resources: // https://trello.com/c/dIUE9YPl/1933-ui-common-resources-and-data-into-galaxy-object var that = this; this.select_genome = new mod_select.View( { @@ -469,7 +469,7 @@ var FolderToolbarView = Backbone.View.extend({ title : 'Please select folders or files', body : template_modal({}), buttons : { - 'Import' : function() { + 'Import' : function() { that.importFromJstreePath( that, options ); }, 'Close' : function() { @@ -503,7 +503,7 @@ var FolderToolbarView = Backbone.View.extend({ that.renderJstree( options ); } } - ); + ); }, /** @@ -518,9 +518,9 @@ var FolderToolbarView = Backbone.View.extend({ var target = options.source || 'userdir'; var disabled_jstree_element = this.options.disabled_jstree_element; this.jstree = new mod_library_model.Jstree(); - this.jstree.url = this.jstree.urlRoot + - '?target=' + target + - '&format=jstree' + + this.jstree.url = this.jstree.urlRoot + + '?target=' + target + + '&format=jstree' + '&disable=' + disabled_jstree_element; this.jstree.fetch({ success: function(model, response){ @@ -583,8 +583,8 @@ var FolderToolbarView = Backbone.View.extend({ }; this.initChainCallControl( { length: valid_paths.length, action: 'adding_datasets' } ); this.chainCallImportingFolders( { paths: valid_paths, - preserve_dirs: preserve_dirs, - link_data: link_data, + preserve_dirs: preserve_dirs, + link_data: link_data, source: 'admin_path', file_type: file_type, dbkey: dbkey } ); @@ -626,9 +626,9 @@ var FolderToolbarView = Backbone.View.extend({ /** * Take the selected items from the jstree, create a request queue - * and send them one by one to the server for importing into - * the current folder. - * + * and send them one by one to the server for importing into + * the current folder. + * * jstree.js has to be loaded before * @see renderJstree */ @@ -653,8 +653,8 @@ var FolderToolbarView = Backbone.View.extend({ if ( selection_type === 'folder' ){ var full_source = options.source + '_folder'; this.chainCallImportingFolders( { paths: paths, - preserve_dirs: preserve_dirs, - link_data: link_data, + preserve_dirs: preserve_dirs, + link_data: link_data, source: full_source, file_type: file_type, dbkey: dbkey } ); @@ -767,7 +767,7 @@ var FolderToolbarView = Backbone.View.extend({ } return true; } - var promise = $.when( $.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets?encoded_folder_id=' + that.id + + var promise = $.when( $.post( ( window.galaxy_config ? galaxy_config.root : '/' ) + 'api/libraries/datasets?encoded_folder_id=' + that.id + '&source=' + options.source + '&path=' + popped_item + '&file_type=' + options.file_type + @@ -789,7 +789,7 @@ var FolderToolbarView = Backbone.View.extend({ * @param {array} paths paths relative to Galaxy root folder * @param {boolean} preserve_dirs indicates whether to preserve folder structure * @param {boolean} link_data copy files to Galaxy or link instead - * @param {str} source string representing what type of folder + * @param {str} source string representing what type of folder * is the source of import */ chainCallImportingFolders: function( options ){ @@ -825,7 +825,7 @@ var FolderToolbarView = Backbone.View.extend({ }, /** - * Take the array of hdas and create a request for each. + * Take the array of hdas and create a request for each. * Call them in chain and update progress bar in between each. * @param {array} hdas_set array of empty hda objects */ @@ -859,7 +859,7 @@ var FolderToolbarView = Backbone.View.extend({ }, /** - * Take the array of lddas, create request for each and + * Take the array of lddas, create request for each and * call them in chain. Update progress bar in between each. * @param {array} lddas_set array of lddas to delete */ @@ -953,7 +953,7 @@ var FolderToolbarView = Backbone.View.extend({ var items_total = dataset_ids.length + folder_ids.length this.progressStep = 100 / items_total; this.progress = 0; - + // prepare the dataset items to be added var items_to_delete = []; for (var i = dataset_ids.length - 1; i >= 0; i--) { @@ -1017,7 +1017,7 @@ var FolderToolbarView = Backbone.View.extend({ case "importdir": this.importFilesFromGalaxyFolderModal( { source: 'importdir' } ); break; - case "path": + case "path": this.importFilesFromPathModal(); break; case "userdir": @@ -1215,7 +1215,7 @@ var FolderToolbarView = Backbone.View.extend({ tmpl_array.push('
All files you select will be imported into the current folder.
'); tmpl_array.push(''); - + tmpl_array.push('
'); tmpl_array.push('